Fix some intellij derps when moving the files