Moving things around to work with IntelliJ.