Reorg and commenting
continuing reorg and mild refactoring
more reorg and todos