moved all the files around so that it would be more platform independant