fixed package structure
Merge pull request #1 from mvk-team42/crawl-jonathan

fixed package structure, and some minor bugs