moved everything out of subdirs