Revert "Refactored package structure"

This reverts commit 4ba4ac4e6e870763b890860b56de505621929861.
Nyt testitkin toimii taas
Merge branch 'master' of https://github.com/Vaakapallo/NPC-dangerzone