Changed location of some helper libraries into lib subfolder