Moved Models to separate project