Refactoring to move code to right locations. Attempt at breaking dependency cycles.
51 files changed