Cleaned up gear packages moving a few things around