Grouping by modules

Now all implemented API calls grouped by relevant modules.