tried to rearrange dirs and namespaces.  currently broken.