Organising files and error fixing