Start the process to included gettext for internalization
Modifications to organize the code.