Spec folder cleanup
Refactoring: XML building splittet into multiple methods