Refactoring is ongoing: removing not used *.xml and java classes.