Add some shit I missed, finish reorganizing.
Fixes Redmine #123.