Change include management.

Now subdirectory must be specified. The main reason for this change, is that this explicitely sets where the file is. Moreover, it "simplifies" CMakeLists.txt files.