Organised files a bit
Changed final classfile, updated files to reflect file name changes.