Fixed directory structure. This resolves #2