Reorganising and refactoring, new monster time!