added rspec and reogranized a bit