Fixed a few issues from class/struct redefinitions. There are a few less warnings about a class being labeled later as a struct of struct labeled as a class. Will continue to look for and fix these type of warnings. Still need to run a linux compile to check all changes.