Squash all changes for DSPManager/Sim toolkit and reorganize