moved all models into types directory