Moving spec/lib to spec/api-model