Moved files to app folder