Moved some util classes to the correct projects