restructured hierarchy, moved some files around