Improved the courtesy functions and sorted the code

By adding some sorts, diff will no longer contain that much changes as
services and structs will now be created alphabetical.
One file remaining...
Merge pull request #10 from svanharmelen/dev

Improved the courtesy functions and sorted the code for better viewing and cleaner diffs