Removing old files
Adding new naming convention