General code cleanups. Removed old gesture code.
Tidied up folder structure