Moved app to app folder