Changes on file names and follow platform conventions