Created utils file, moved to package form