Moved everything to Tasks, moved constants to their own class