modify components to components/app, base