Refactoring of the current code base. There are still issues with the import of model files.