big reorg of dirs, namespace. proper pack name imports