Simplify include/libs dir