another banch of refactoring, it is possible now to create fewer controllers