Moving some more things around and adding OpenSSL dependencies