more path cleanups
massive commit of outdated changes
finishing reorg