Re-organised the files for clarity