Move specs into appropriate subdirectories.
Namespace specs appropriately.