Made PUT and POST return resource
Moved tests into folders