moved models from lib into their own folder