Finish refactoring models, test install process