Several changes for the new structure
Some of the models that will be used
renamed app/app