Removed cruft. Reorganized into modules.