Updated .gitignore
Fixed namespaces
Renaming