renamed controllers and model, refactored view