Created Util Package. Refactored Util classes.