It seems better to have seperated directories for different parts of the library and also put the suplementary service stuff into the same library. Signed-off-by: Karsten Keil <kkeil@linux-pingi.de>