* Macro for contruction messages changed to function. * Source code reorganization