Standardized modules

Noticed I used a different filename and dir path for lib standardized it.

Also forgot to save an email template.  Saved and now set to upload.