Re-ordered current files and added new models