Cleanup code, and rename models and controllers