Check differently for packaging structure.

Hopefully it works, not tested yet with right structure.

This should fix #24