Tidy up a little after recent changes.
Merge pull request #21 from csmith/master

Remove ActionListener.
Merge pull request #22 from greboid/master

Tidy up after recent changes.
Switch some file usages to paths.