Reorganize classes to internal package
Created Util class to prevent code duplication