Simplify directory names and update cmake. TODO: check compile status