Some namespace changes... and gitignore.