Refactoring: Remastered.

All the onion scripts are refactored...what now?