Use pages/components instead of ui-pages/ui-components