Reorganization

Way betterified woohoo now giggles