adjust file structures; update version