Move model files into main project

TODO: update the POM properly.