Misc. cleanup
Reorganize specs
Add adaptor specs