weekly commit

refactor 3 main controllers