Recommit for first public alpha & dev reorg