moved some files around and cleaned up some unneeded files.