reorganised code base and completed exercises as trial