Small refactor to reorder modules