hyphen cannot be used as python module name,
so the default cookiecutter example does not work completely.
Once module_name is fixed, module_name and module_folder are
now always same and module_folder is now unnecessary.
Thus this commit also drops module_folder.
Change-Id: I28a5f7bd349d73627874e1466c72cc66e918f77b