Corrected file structure

I made the file structure look more like the categories in Cubesuite.
This means that when you look at the files on the filesystem they appear
the same way they do in CubeSuite+.
Preliminary local testing
Merge branch 'localTests' into buttonTimeout