more changes to structure and default work directory