Rename files and remove some console.log statements