Reorganized app file structure