* Changed code formatting
* Several minor fixes
* beginnings of split between modules and extensions