reorg
more changes
better project names