Update to master -- renamed some IntelliJ related project files