Moved models to model subpackage
Fixed broken import