changed directory structure
INCOMPLETE: namespaces defined, but errors in code