Begin to rename files and clean up old code.