Renamed some files and move a bit of code to make it easier to have other pages later