Fix directory structure and update RESTful Citybike app.