Remove old instances, add new functions with docs
Update module abstraction functions
Reorganize
Merge branch 'master' into webserver
Quick commit for zip install