cleanup & comment code.
add include xml files in JavaApp config file.