Move file in line with namespace and eliminate warnings (last 2 warnings await rspec-core)