update

removing global depend. also renaming some files so that all files can
lie in the same directory