Moving things around to work with IntelliJ (new locations).