some java classes have been renamed and few bugs have been fixed