Moving models to lib
Adding form