Added modeling project
Minor refactoring
Better error messages and minor fix of last commit
Updated diagram