Moved some java classes around

Signed-off-by: Madx-com <Madx.com@gmail.com>