Fixed file name #1
Fixed file name #2
Fixed some compiler warnings.
GCC rejects the enum classes here. Replacing them with ints for now.
Added CMakeLists.