Adding two context elements, moving Task and Context from Context
package to Task package