Added a package

Took a while to figure out how to get it to cooperate with the
makefile. Simplified as much as possible in the process. Some comments
leftover. Will fix structure and remove extra comments.