Reorganised files, updated debugging page