moved models from lib/ to models/