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