move file in line with namespace and eliminate warnings (last 2 depend on rspec-core)