Repackage, formatting
Rewrite Behavior system to OOC