Basic reorganization of some Java solutions.

Some solutions were not placed in Java folder.