structure changes and dependencies version update