Yavalath.java modularized