Restructuring

Program currently non function pending more adjustments