Restructuring: Updated modules in SDX lib