Simplify namespace structure, add namespace to task structure