More cleanup: removing old adm/xml-based code, packages and reorganized the tests
Code cleanup: removed unused imports