Cleaned up specs by putting them in modules.