Changed naming for base and working directories and allowed naming each seperately in options rathar than guessing their locations.