Rename Modules
Finish message functionality