Cleaned up packages, put in smaller and appropriate model