moved several files, added a simpler register tool, added tests for closure