reorg repo - still trying to get it right