migrate to improved module syntax - fixes #25