simplified code
moved files out of original files folder so that I can change them. keeping the copyright and readme as it is