Change file names and clean code