Refactor, reorganise and rethink