fix directory structure and scala version