Tidied up third party sources, moved zlib and openssl to pkgs