redid directory structure and added rspec