Updated stuff (things exist & MAJOR Reorganization)

If there are any errors BLAME ClayCorp and his not registering all items
in all the places where they *SHOULD* be at