Package cleanup and other.

Might add some more "Gadgets" later. This pull request is just to update file directories that @pookeythekid failed to do :smile: