Cleaned up the registry abit, now everything should be much more
organised
*ahem* Stuff