Resolves #28
More changes for #28

Should fully resolve #28 now.
Resolves #31, #41
One last prefix issue, I hope
Working on #50, partially complete
Resolves #50

A few remaining package renames :(