Restructuring the API app.
Cleaning up the module structures.