models moved into app directory