Rearranging classes and adding Shields objects