Restructured app to match feature/function file structure