codebase re-organization of actual files/directories to make the app tree more intuitive