Fixed up directory structure.
Added Bools to Init and terminate for test reasons
Had Trouble with CMake but seemed to be a merge error
Fixed on my build in my branch for Linux.