Moved Utilities Package, refactored code