Utilities moved to appropriate place