Restructuring java2sdg and adding tasks