Move Expert/Base to Component/Expert