fix dir structure; fix make file for coverage