restructurization

begining of tasks
unitCollection