Renaming files to match new convention, other minor fixes