Simplifiyng and reducing package setup