Packaga name refactor and IntelliJ migration