rearranged to constrain everything to the base_app
rearranged to constrain everything to the base_app
Final touches on the new app-like structure