Completely revamp organization.

Remove some untested features as well. Plan to add them back later.