Tweaked CMakeLists and project organization