massive fs reorg and cleanup