Refactored utilities into separate folder.