fixes to account for organization in utils