Sorted module names alphabetically
Renamed modules names with dots
Merge remote-tracking branch 'origin/master'