Reorganised the files so it's clean and makes more sense