Organised classes to sub packages, extracted task attribute setter classes