Restructuring: removing redundant files from SDX lib