Moving models to separate library