moving stuff around and adding rspec scaffolding