migrated utils to seperate package