Fixed layout and REST

Fixed layout and RESTful URIs