Copy and pasted the classes from my branch into here

Fixed the merging, by putting all the files into one folder