Fix subtree placement

A rebase destroyed the position of the CMake files in pull request #150. Fixing this.