File move refactoring causing freezing, deleting files

Using Intellij (details follow), I am trying to restructure a project into multiple modules. When I drag a folder to a newly created module, most of the time (probably 75% of the time) the IDE freezes after the search for refactorings and during the actual copying phase. Occasionally, when I force quit files go missing and I have to re-clone the repo and start over. For reference, we are not talking hundreds of files. This is a move of 7 or 8 .java files and maybe a properties file. Total size is in the hundreds of Kb. 

IntelliJ IDEA 2017.1.2
Build #IU-171.4249.39, built on April 25, 2017
JRE: 1.8.0_112-release-736-b16 x86_64
JVM: OpenJDK 64-Bit Server VM by JetBrains s.r.o
Mac OS X 10.12.4