Updating dependencies + Changed changed distribution directory structure to match development directory structure