reorganize
update paths