Clean up rspecs; re-organize classes to prepare for merge.