Some file changes for convention