More renames and refactoring

- Removed anonymous "ClickListener" classes
Delete unused file
Merge pull request #5 from matthew-woolley/master

Renames and Refactors