use new-style rspec syntax
reorganize lib spec files into the expected hierarchy