Moved files to app directory, added orm, added DIC