more reorg and cleanup

removed some redundant examples and cleaned up the code a bit.