fixed #25 (it's not as bad as it looks. Mostly package-renaming)