Refactoring some files to split original and HolisticWare additionals