Move some classes to utils package