More location support
Start transition to CMake