Redo project structure
new app / restructured