- more changes to model
- moved dependencies to parent pom
- organized imports