Moved tasks into a folder (#564)
fix package names and paths