Changed Package for Real

Now it's changed in ALL the things. :D

Also cleaned up the code significantly.