Moved models and specs into app folder