Initial commit with namespaces added. @mszymczak-neducatio