Added config exception handling; Improve type namming;
Rework the logic related to handling the config file
Code cleanup