Remove old instances, add new functions with docs
Update module abstraction functions