Code clean up

Code has been cleaned up. Some files merged, some removed. Thanks to
contributor Natalie Prowse for the hard work!