Add modules & IO test programs