Changed files to work with intellij
Created Util Package. Refactored Util classes.