Package naming fix
Hurr durr derp
Fixes with names and uses and whatever to make it all compile at least...