restructuring and changes as per direct apt-get connection (no proxy)