- Fixed buffer overflow.
- Redid hierarchy into proper packages (because why not).