Move APP into app folder