mv decorator to task, added packages structure to task, var
rm wrapper