Fix project layout issue. Now it should build per instructions.