Dev dir works with CPP builds now too