Reorganised

Readme still needs fixing