Finished renaming of files. Does not compile yet.
Adjusted include statements. It's compiling again!