minor refactoring. xml files moved into new folder