Reorganised file structure, made big changes to file names