Rename files and move code