There are some minor clean-up issues, but overall, it did the trick. https://i.ibb.co/MP2JNRM/classes-renamed.png https://i.ibb.co/MP2JNRM/classes-renamed.png

There are some minor clean-up issues, but overall, it did the trick. https://i.ibb.co/MP2JNRM/classes-renamed.png https://i.ibb.co/MP2JNRM/classes-renamed.png Thank you!