refactoring model out of xml (compilation still broken)