directory restructure
update paths