Reorganised and removed Dockerfiles which belong elsewhere