directory restructure
directory restructure fix