Moved files out of app folder