fixes #27: adjust directory structure