reorganization into the app folder