code clean - java code moved to new directory