Reorganize folder structure to allow new app