Move all into app folder