Some minor refactoring and reorganization.
Some minor refactoring and reorganization.

olabini/ioke,olabini/ioke,olabini/ioke,olabini/ioke,bculkin2442/ioke,bculkin2442/ioke,bculkin2442/ioke,bculkin2442/ioke,olabini/ioke,bculkin2442/ioke,olabini/ioke,bculkin2442/ioke,bculkin2442/ioke