added untracked files
Name space and class name tidy