Reorganised

Fully Amended