Removed Constants files from the util package and added them to root.

Executed Java tests. No regression.