Some small re factoring, removed and sorted using's, and unified all files, to be inside the namespace.