reside in separate subdirectories (various source moved by repository copying). Adapt Makefiles to new situation.