Renamed schema folders
folder name is plural of the entity in it
Moved tests around to match schema
Merge pull request #180 from AnthonySteele/schema-naming

Schema naming
Merge branch 'master' into http-dispose