Rearranged the file structure - more fitting to keep every task def together with their help/test/debug targets