Added /lib and removed parametrization for Java<1.7