THE BIG REFACTOR HAS STARTED

Why not do everthing in one MR?