Reorganised the files and renamed a bit