rearranging, no more source dir, updated CMakeList for example.