more restructuring and version update