Controls module refactoring