Switched over some files to the app folder.