Added more config files and directories - changed rspec to match changes