Merge "[UUI] Move components to component dir"