renamed namespace, reorg'd the files/folders