Renaming environment to namespace
Fixing layout
Fixing missing self
Adding in basic namespaces