Start of the great refactoring
4 files changed