Changing source structure to conform to normal coding standards.