Move most files from package tasking to task