Adds Structure and Unit classes after they were left out in the last commit