updated the project.xml model, did a bit of refactoring to prevent circular import of some interfaces