add support for META-INF/lib and META-INF/extra-files
cleanup
cleanup