Changing folder structure + fix bug #3 (maybe?)
Merge branch 'master' of https://github.com/LewisHallam/Escapades
(I'm confused o.o)