Merge pull request #16 from jank0s/master

Template structure and module naming
Module rename workaround