Just renamed a couple of files in order to clean up in an easier way