Removing the two new commandlets (will send in next release) and restruc...

...turing the code.