package refactoring
major refactoring of model