restructure, heading towards having a common library jar for model classes