Move to com.github.nik9000 package