Group functions by module
Merge pull request #8 from keithseahus/develop

Group functions by module