Relocate some models from lib