Sort out dependencies, have the infamous utils module again