Add package warcraft and refactor