Avoid duplicate header names

[nsubtil]

Lift currently lift/test.h and lift/test/test.h header files. This arrangement is somewhat confusing.

In a more general sense, having duplicate header file names in different directories is probably best avoided.