Reorganised, removed old files