Improve naming
Clear overrides on mouse down
Capitalize module names
Minor refactoring
work in progress...