Use common directory structure. Fixes #3