diff --git a/test/.gitignore b/test/.gitignore
index 430aa5c5e..f6ca1b77b 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,3 +1,4 @@
+*.o
 *.log
 att.t
 autocomplete.t
diff --git a/test/Makefile b/test/Makefile
index 4e07b7a54..21b167cab 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,21 +2,21 @@ PROJECT = t.t tdb.t date.t duration.t t.benchmark.t text.t autocomplete.t      \
           config.t seq.t att.t stringtable.t record.t nibbler.t subst.t filt.t \
           cmd.t util.t color.t list.t path.t file.t directory.t grid.t rx.t    \
           taskmod.t sensor.t rectangle.t tree.t tree2.t lisp.t uri.t
-CFLAGS  = -I. -I.. -I../.. -Wall -pedantic -ggdb3 -fno-rtti
+CFLAGS  = -I. -I.. -I../src -Wall -pedantic -ggdb3 -fno-rtti
 LFLAGS  = -L/usr/local/lib -lpthread -llua
-OBJECTS = ../t-TDB.o ../t-Task.o ../t-text.o ../t-Date.o ../t-Table.o          \
-          ../t-Duration.o ../t-util.o ../t-Config.o ../t-Sequence.o ../t-Att.o \
-          ../t-Cmd.o ../t-Record.o ../t-StringTable.o ../t-Subst.o             \
-          ../t-Nibbler.o ../t-Location.o ../t-Filter.o ../t-Context.o          \
-          ../t-Keymap.o ../t-command.o ../t-interactive.o ../t-report.o        \
-          ../t-Grid.o ../t-Color.o ../t-rules.o ../t-recur.o ../t-custom.o     \
-          ../t-export.o ../t-import.o ../t-edit.o ../t-Timer.o                 \
-          ../t-Permission.o ../t-Path.o ../t-File.o ../t-Directory.o           \
-          ../t-Hooks.o ../t-API.o ../t-rx.o ../t-Taskmod.o ../t-dependency.o   \
-          ../t-Transport.o ../t-TransportSSH.o ../t-Sensor.o ../t-Thread.o     \
-          ../t-Lisp.o ../t-Rectangle.o ../t-Tree.o ../t-TransportRSYNC.o       \
-          ../t-TransportCurl.o ../t-Uri.o ../t-diag.o ../t-burndown.o          \
-          ../t-history.o
+OBJECTS = ../src/t-TDB.o ../src/t-Task.o ../src/t-text.o ../src/t-Date.o ../src/t-Table.o          \
+          ../src/t-Duration.o ../src/t-util.o ../src/t-Config.o ../src/t-Sequence.o ../src/t-Att.o \
+          ../src/t-Cmd.o ../src/t-Record.o ../src/t-StringTable.o ../src/t-Subst.o             \
+          ../src/t-Nibbler.o ../src/t-Location.o ../src/t-Filter.o ../src/t-Context.o          \
+          ../src/t-Keymap.o ../src/t-command.o ../src/t-interactive.o ../src/t-report.o        \
+          ../src/t-Grid.o ../src/t-Color.o ../src/t-rules.o ../src/t-recur.o ../src/t-custom.o     \
+          ../src/t-export.o ../src/t-import.o ../src/t-edit.o ../src/t-Timer.o                 \
+          ../src/t-Permission.o ../src/t-Path.o ../src/t-File.o ../src/t-Directory.o           \
+          ../src/t-Hooks.o ../src/t-API.o ../src/t-rx.o ../src/t-Taskmod.o ../src/t-dependency.o   \
+          ../src/t-Transport.o ../src/t-TransportSSH.o ../src/t-Sensor.o ../src/t-Thread.o     \
+          ../src/t-Lisp.o ../src/t-Rectangle.o ../src/t-Tree.o ../src/t-TransportRSYNC.o       \
+          ../src/t-TransportCurl.o ../src/t-Uri.o ../src/t-diag.o ../src/t-burndown.o          \
+          ../src/t-history.o
 
 all: $(PROJECT)
 
diff --git a/test/abbreviation.t b/test/abbreviation.t
index 082fe6a58..a8d71e051 100755
--- a/test/abbreviation.t
+++ b/test/abbreviation.t
@@ -39,53 +39,53 @@ if (open my $fh, '>', 'abbrev.rc')
 }
 
 # Test the priority attribute abbrevations.
-qx{../task rc:abbrev.rc add priority:H with};
-qx{../task rc:abbrev.rc add without};
+qx{../src/task rc:abbrev.rc add priority:H with};
+qx{../src/task rc:abbrev.rc add without};
 
-my $output = qx{../task rc:abbrev.rc list priority:H};
+my $output = qx{../src/task rc:abbrev.rc list priority:H};
 like   ($output, qr/\bwith\b/,    'priority:H with');
 unlike ($output, qr/\bwithout\b/, 'priority:H without');
 
-$output = qx{../task rc:abbrev.rc list priorit:H};
+$output = qx{../src/task rc:abbrev.rc list priorit:H};
 like   ($output, qr/\bwith\b/,    'priorit:H with');
 unlike ($output, qr/\bwithout\b/, 'priorit:H without');
 
-$output = qx{../task rc:abbrev.rc list priori:H};
+$output = qx{../src/task rc:abbrev.rc list priori:H};
 like   ($output, qr/\bwith\b/,    'priori:H with');
 unlike ($output, qr/\bwithout\b/, 'priori:H without');
 
-$output = qx{../task rc:abbrev.rc list prior:H};
+$output = qx{../src/task rc:abbrev.rc list prior:H};
 like   ($output, qr/\bwith\b/,    'prior:H with');
 unlike ($output, qr/\bwithout\b/, 'prior:H without');
 
-$output = qx{../task rc:abbrev.rc list prio:H};
+$output = qx{../src/task rc:abbrev.rc list prio:H};
 like   ($output, qr/\bwith\b/,    'prio:H with');
 unlike ($output, qr/\bwithout\b/, 'prio:H without');
 
-$output = qx{../task rc:abbrev.rc list pri:H};
+$output = qx{../src/task rc:abbrev.rc list pri:H};
 like   ($output, qr/\bwith\b/,    'pri:H with');
 unlike ($output, qr/\bwithout\b/, 'pri:H without');
 
 # Test the version command abbreviations.
-$output = qx{../task rc:abbrev.rc version};
+$output = qx{../src/task rc:abbrev.rc version};
 like ($output, qr/GNU\s+General\s+Public\s+License/, 'version');
 
-$output = qx{../task rc:abbrev.rc versio};
+$output = qx{../src/task rc:abbrev.rc versio};
 like ($output, qr/GNU\s+General\s+Public\s+License/, 'versio');
 
-$output = qx{../task rc:abbrev.rc versi};
+$output = qx{../src/task rc:abbrev.rc versi};
 like ($output, qr/GNU\s+General\s+Public\s+License/, 'versi');
 
-$output = qx{../task rc:abbrev.rc vers};
+$output = qx{../src/task rc:abbrev.rc vers};
 like ($output, qr/GNU\s+General\s+Public\s+License/, 'vers');
 
-$output = qx{../task rc:abbrev.rc ver};
+$output = qx{../src/task rc:abbrev.rc ver};
 like ($output, qr/GNU\s+General\s+Public\s+License/, 'ver');
 
-$output = qx{../task rc:abbrev.rc ve};
+$output = qx{../src/task rc:abbrev.rc ve};
 like ($output, qr/GNU\s+General\s+Public\s+License/, 've');
 
-$output = qx{../task rc:abbrev.rc v};
+$output = qx{../src/task rc:abbrev.rc v};
 like ($output, qr/GNU\s+General\s+Public\s+License/, 'v');
 
 # Cleanup.
diff --git a/test/add.t b/test/add.t
index 4c32c285d..3ee672757 100755
--- a/test/add.t
+++ b/test/add.t
@@ -40,17 +40,17 @@ if (open my $fh, '>', 'add.rc')
 }
 
 # Test the add command.
-qx{../task rc:add.rc add This is a test};
-my $output = qx{../task rc:add.rc info 1};
+qx{../src/task rc:add.rc add This is a test};
+my $output = qx{../src/task rc:add.rc info 1};
 like ($output, qr/ID\s+1\n/, 'add ID');
 like ($output, qr/Description\s+This is a test\n/, 'add ID');
 like ($output, qr/Status\s+Pending\n/, 'add Pending');
 like ($output, qr/UUID\s+[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\n/, 'add UUID');
 
 # Test the /// modifier.
-qx{../task rc:add.rc 1 /test/TEST/};
-qx{../task rc:add.rc 1 "/is //"};
-$output = qx{../task rc:add.rc info 1};
+qx{../src/task rc:add.rc 1 /test/TEST/};
+qx{../src/task rc:add.rc 1 "/is //"};
+$output = qx{../src/task rc:add.rc info 1};
 like ($output, qr/ID\s+1\n/, 'add ID');
 like ($output, qr/Status\s+Pending\n/, 'add Pending');
 like ($output, qr/Description\s+This a TEST\n/, 'add ID');
diff --git a/test/alias.t b/test/alias.t
index e0b062222..ed310b42e 100755
--- a/test/alias.t
+++ b/test/alias.t
@@ -41,15 +41,15 @@ if (open my $fh, '>', 'alias.rc')
 }
 
 # Add a task with certain project, then access that task via aliases.
-qx{../task rc:alias.rc add project:ALIAS foo};
+qx{../src/task rc:alias.rc add project:ALIAS foo};
 
-my $output = qx{../task rc:alias.rc _projects};
+my $output = qx{../src/task rc:alias.rc _projects};
 like ($output, qr/ALIAS/, 'task _projects -> ALIAS');
 
-$output = qx{../task rc:alias.rc foo};
+$output = qx{../src/task rc:alias.rc foo};
 like ($output, qr/ALIAS/, 'task foo -> _projects -> ALIAS');
 
-$output = qx{../task rc:alias.rc bar};
+$output = qx{../src/task rc:alias.rc bar};
 like ($output, qr/ALIAS/, 'task bar -> foo -> _projects -> ALIAS');
 
 # Cleanup.
diff --git a/test/annotate.t b/test/annotate.t
index 0912d7db1..b6c963470 100755
--- a/test/annotate.t
+++ b/test/annotate.t
@@ -45,24 +45,24 @@ if (open my $fh, '>', 'annotate.rc')
 }
 
 # Add four tasks, annotate one three times, one twice, one just once and one none.
-qx{../task rc:annotate.rc add one};
-qx{../task rc:annotate.rc add two};
-qx{../task rc:annotate.rc add three};
-qx{../task rc:annotate.rc add four};
-qx{../task rc:annotate.rc annotate 1 foo1};
+qx{../src/task rc:annotate.rc add one};
+qx{../src/task rc:annotate.rc add two};
+qx{../src/task rc:annotate.rc add three};
+qx{../src/task rc:annotate.rc add four};
+qx{../src/task rc:annotate.rc annotate 1 foo1};
 diag ("5 second delay");
 sleep 1;
-qx{../task rc:annotate.rc annotate 1 foo2};
+qx{../src/task rc:annotate.rc annotate 1 foo2};
 sleep 1;
-qx{../task rc:annotate.rc annotate 1 foo3};
+qx{../src/task rc:annotate.rc annotate 1 foo3};
 sleep 1;
-qx{../task rc:annotate.rc annotate 2 bar1};
+qx{../src/task rc:annotate.rc annotate 2 bar1};
 sleep 1;
-qx{../task rc:annotate.rc annotate 2 bar2};
+qx{../src/task rc:annotate.rc annotate 2 bar2};
 sleep 1;
-qx{../task rc:annotate.rc annotate 3 baz1};
+qx{../src/task rc:annotate.rc annotate 3 baz1};
 
-my $output = qx{../task rc:annotate.rc rrr};
+my $output = qx{../src/task rc:annotate.rc rrr};
 
 # ID Description                    
 # -- -------------------------------
@@ -91,7 +91,7 @@ like ($output, qr/bar1.+\d{1,2}\/\d{1,2}\/\d{4} bar2/ms, 'full - second annotati
 like ($output, qr/three.+\d{1,2}\/\d{1,2}\/\d{4} baz1/ms,'full - first  annotation task 3');
 like ($output, qr/4 tasks/, 'count');
 
-$output = qx{../task rc:annotate.rc rc.annotations:sparse rrr};
+$output = qx{../src/task rc:annotate.rc rc.annotations:sparse rrr};
 like   ($output, qr/1 \+one/, 'task 1');
 like   ($output, qr/2 \+two/, 'task 2');
 like   ($output, qr/3 three/, 'task 3');
@@ -104,7 +104,7 @@ like   ($output, qr/two.+\d{1,2}\/\d{1,2}\/\d{4} bar2/ms,   'sparse - second ann
 like   ($output, qr/three.+\d{1,2}\/\d{1,2}\/\d{4} baz1/ms, 'sparse - third  annotation task 3');
 like   ($output, qr/4 tasks/, 'count');
 
-$output = qx{../task rc:annotate.rc rc.annotations:none rrr};
+$output = qx{../src/task rc:annotate.rc rc.annotations:none rrr};
 like   ($output, qr/1 \+one/,   'task 1');
 like   ($output, qr/2 \+two/,   'task 2');
 like   ($output, qr/3 \+three/, 'task 3');
@@ -131,7 +131,7 @@ if (open my $fh, '>', 'annotate2.rc')
   ok (-r 'annotate2.rc', 'Created annotate2.rc');
 }
 
-$output = qx{../task rc:annotate2.rc rrr};
+$output = qx{../src/task rc:annotate2.rc rrr};
 like ($output, qr/1 one/,   'task 1');
 like ($output, qr/2 two/,   'task 2');
 like ($output, qr/3 three/, 'task 3');
diff --git a/test/append.t b/test/append.t
index 147e7a271..8e687b19d 100755
--- a/test/append.t
+++ b/test/append.t
@@ -39,9 +39,9 @@ if (open my $fh, '>', 'append.rc')
 }
 
 # Add a task, then append more decsription.
-qx{../task rc:append.rc add foo};
-qx{../task rc:append.rc 1 append bar};
-my $output = qx{../task rc:append.rc info 1};
+qx{../src/task rc:append.rc add foo};
+qx{../src/task rc:append.rc 1 append bar};
+my $output = qx{../src/task rc:append.rc info 1};
 like ($output, qr/Description\s+foo\sbar\n/, 'append worked');
 
 # Cleanup.
diff --git a/test/args.t b/test/args.t
index 999a2d81a..2ce7c5a91 100755
--- a/test/args.t
+++ b/test/args.t
@@ -40,24 +40,24 @@ if (open my $fh, '>', 'args.rc')
 }
 
 # Test the -- argument.
-qx{../task rc:args.rc add project:p pri:H +tag foo};
-my $output = qx{../task rc:args.rc info 1};
+qx{../src/task rc:args.rc add project:p pri:H +tag foo};
+my $output = qx{../src/task rc:args.rc info 1};
 like ($output, qr/Description\s+foo\n/ms, 'task add project:p pri:H +tag foo');
 
-qx{../task rc:args.rc 1 project:p pri:H +tag -- foo};
-$output = qx{../task rc:args.rc info 1};
+qx{../src/task rc:args.rc 1 project:p pri:H +tag -- foo};
+$output = qx{../src/task rc:args.rc info 1};
 like ($output, qr/Description\s+foo\n/ms, 'task 1 project:p pri:H +tag -- foo');
 
-qx{../task rc:args.rc 1 project:p pri:H -- +tag foo};
-$output = qx{../task rc:args.rc info 1};
+qx{../src/task rc:args.rc 1 project:p pri:H -- +tag foo};
+$output = qx{../src/task rc:args.rc info 1};
 like ($output, qr/Description\s+\+tag\sfoo\n/ms, 'task 1 project:p pri:H -- +tag foo');
 
-qx{../task rc:args.rc 1 project:p -- pri:H +tag foo};
-$output = qx{../task rc:args.rc info 1};
+qx{../src/task rc:args.rc 1 project:p -- pri:H +tag foo};
+$output = qx{../src/task rc:args.rc info 1};
 like ($output, qr/Description\s+pri:H\s\+tag\sfoo\n/ms, 'task 1 project:p -- pri:H +tag foo');
 
-qx{../task rc:args.rc 1 -- project:p pri:H +tag foo};
-$output = qx{../task rc:args.rc info 1};
+qx{../src/task rc:args.rc 1 -- project:p pri:H +tag foo};
+$output = qx{../src/task rc:args.rc info 1};
 like ($output, qr/Description\s+project:p\spri:H\s\+tag\sfoo\n/ms, 'task 1 -- project:p pri:H +tag foo');
 
 # Cleanup.
diff --git a/test/backslash.t b/test/backslash.t
index 8ecb4aced..7216322c3 100755
--- a/test/backslash.t
+++ b/test/backslash.t
@@ -39,8 +39,8 @@ if (open my $fh, '>', 'backslash.rc')
 }
 
 # Add a description with a backslash.
-qx{../task rc:backslash.rc add foo\\\\bar};
-my $output = qx{../task rc:backslash.rc ls};
+qx{../src/task rc:backslash.rc add foo\\\\bar};
+my $output = qx{../src/task rc:backslash.rc ls};
 like ($output, qr/foo\\bar/, 'Backslash preserved, no parsing issues');
 
 # Cleanup.
diff --git a/test/basic.t b/test/basic.t
index 462589d72..3aed90217 100755
--- a/test/basic.t
+++ b/test/basic.t
@@ -43,17 +43,17 @@ if (open my $fh, '>', 'basic.rc')
 my $version = slurp ('../../configure.ac');
 
 # Test the usage command.
-my $output = qx{../task rc:basic.rc};
+my $output = qx{../src/task rc:basic.rc};
 like ($output, qr/You must specify a command, or a task ID to modify/m, 'missing command and ID');
 
 # Test the version command.
-$output = qx{../task rc:basic.rc version};
+$output = qx{../src/task rc:basic.rc version};
 like ($output, qr/task $version/, 'version - task version number');
 like ($output, qr/GNU\s+General\s+Public\s+License/, 'version - license');
 like ($output, qr/http:\/\/taskwarrior\.org/, 'version - url');
 
 # Test the _version command.
-$output = qx{../task rc:basic.rc _version};
+$output = qx{../src/task rc:basic.rc _version};
 like ($output, qr/$version/, '_version - task version number');
 
 # Cleanup.
diff --git a/test/benchmark.t b/test/benchmark.t
index 8f90355e9..531519bc6 100755
--- a/test/benchmark.t
+++ b/test/benchmark.t
@@ -58,14 +58,14 @@ for my $i (1 .. 1000)
   my $priority = $priorities[rand % 3];
   my $tag      =       $tags[rand % 8];
 
-  qx{../task rc:bench.rc add project:$project priority:$priority +$tag $i $description};
+  qx{../src/task rc:bench.rc add project:$project priority:$priority +$tag $i $description};
 }
 diag ("1000 tasks added in " . (time () - $cursor) . " seconds");
 $cursor = time ();
 
-qx{../task rc:bench.rc /with/WITH/}         for   1 .. 200;
-qx{../task rc:bench.rc done $_}             for 201 .. 400;
-qx{../task rc:bench.rc start $_}            for 401 .. 600;
+qx{../src/task rc:bench.rc /with/WITH/}         for   1 .. 200;
+qx{../src/task rc:bench.rc done $_}             for 201 .. 400;
+qx{../src/task rc:bench.rc start $_}            for 401 .. 600;
 diag ("600 tasks altered in " . (time () - $cursor) . " seconds");
 $cursor = time ();
 
@@ -73,15 +73,15 @@ $cursor = time ();
 
 for (1 .. 100)
 {
-  diag (grep {/^Timer /} qx{../task rc:bench.rc ls});
-  diag (grep {/^Timer /} qx{../task rc:bench.rc list});
-  diag (grep {/^Timer /} qx{../task rc:bench.rc list priority:H});
-  diag (grep {/^Timer /} qx{../task rc:bench.rc list +tag});
-  diag (grep {/^Timer /} qx{../task rc:bench.rc list project_A});
-  diag (grep {/^Timer /} qx{../task rc:bench.rc long});
-  diag (grep {/^Timer /} qx{../task rc:bench.rc completed});
-  diag (grep {/^Timer /} qx{../task rc:bench.rc history});
-  diag (grep {/^Timer /} qx{../task rc:bench.rc ghistory});
+  diag (grep {/^Timer /} qx{../src/task rc:bench.rc ls});
+  diag (grep {/^Timer /} qx{../src/task rc:bench.rc list});
+  diag (grep {/^Timer /} qx{../src/task rc:bench.rc list priority:H});
+  diag (grep {/^Timer /} qx{../src/task rc:bench.rc list +tag});
+  diag (grep {/^Timer /} qx{../src/task rc:bench.rc list project_A});
+  diag (grep {/^Timer /} qx{../src/task rc:bench.rc long});
+  diag (grep {/^Timer /} qx{../src/task rc:bench.rc completed});
+  diag (grep {/^Timer /} qx{../src/task rc:bench.rc history});
+  diag (grep {/^Timer /} qx{../src/task rc:bench.rc ghistory});
 }
 
 # Stop the clock.
diff --git a/test/benchmark2.t b/test/benchmark2.t
index 97e0325e1..ee708e7db 100755
--- a/test/benchmark2.t
+++ b/test/benchmark2.t
@@ -51,22 +51,22 @@ my $output;
 
 # Add 1 task.
 add (1);
-$output = qx{../task rc:bench2.rc list};
+$output = qx{../src/task rc:bench2.rc list};
 report ('run-1', $output);
 
 # Add 9 more tasks.
 add (9);
-$output = qx{../task rc:bench2.rc list};
+$output = qx{../src/task rc:bench2.rc list};
 report ('run-10', $output);
 
 # Add 90 more tasks.
 add (90);
-$output = qx{../task rc:bench2.rc list};
+$output = qx{../src/task rc:bench2.rc list};
 report ('run-100', $output);
 
 # Add 900 more tasks.
 add (900);
-$output = qx{../task rc:bench2.rc list};
+$output = qx{../src/task rc:bench2.rc list};
 report ('run-1000', $output);
 
 # Cleanup.
@@ -95,7 +95,7 @@ sub add
     my $priority = $priorities[rand % 3];
     my $tag      =       $tags[rand % 8];
 
-    qx{../task rc:bench2.rc add project:$project priority:$priority +$tag $i $description};
+    qx{../src/task rc:bench2.rc add project:$project priority:$priority +$tag $i $description};
   }
 }
 
@@ -111,7 +111,7 @@ sub report
   }
 
   # Generate output for benchmark2 chart.
-  chomp (my $version = qx{../task _version});
+  chomp (my $version = qx{../src/task _version});
   my $out = sprintf "%s %s %f,%f,%f,%f,%f,%f,%f",
                     $label,
                     $version,
diff --git a/test/bug.299.t b/test/bug.299.t
index 052f3e3d8..a3a072816 100755
--- a/test/bug.299.t
+++ b/test/bug.299.t
@@ -40,13 +40,13 @@ if (open my $fh, '>', 'bug.rc')
 }
 
 # Setup: Add three unique tasks with different project names.
-qx{../task rc:bug.rc add project:one foo};
-qx{../task rc:bug.rc add project:two bar};
-qx{../task rc:bug.rc add project:three baz};
+qx{../src/task rc:bug.rc add project:one foo};
+qx{../src/task rc:bug.rc add project:two bar};
+qx{../src/task rc:bug.rc add project:three baz};
 
 # Result: Run list but exclude two of the three projects names using
 # project.hasnt:<name>
-my $output = qx{../task rc:bug.rc list project.isnt:one project.isnt:two};
+my $output = qx{../src/task rc:bug.rc list project.isnt:one project.isnt:two};
 unlike ($output, qr/one.*foo/ms, 'project.isnt:one project.isnt:two - no foo');
 unlike ($output, qr/two.*bar/ms, 'project.isnt:one project.isnt:two - no bar');
 like   ($output, qr/three.*baz/ms, 'project.isnt:one project.isnt:two - yes baz');
diff --git a/test/bug.327.t b/test/bug.327.t
index c393a0751..bf85cf290 100755
--- a/test/bug.327.t
+++ b/test/bug.327.t
@@ -40,13 +40,13 @@ if (open my $fh, '>', 'bug.rc')
 }
 
 # Setup: Add a recurring task then remove the due date.
-qx{../task rc:bug.rc add foo recur:yearly due:eoy};
-qx{../task rc:bug.rc li};
-qx{../task rc:bug.rc 2 due:};
+qx{../src/task rc:bug.rc add foo recur:yearly due:eoy};
+qx{../src/task rc:bug.rc li};
+qx{../src/task rc:bug.rc 2 due:};
 
 # Result: Somehow the due date is incremented and wraps around to 12/31/1969,
 # then keeps going back to today.
-my $output = qx{../task rc:bug.rc li};
+my $output = qx{../src/task rc:bug.rc li};
 unlike ($output, qr/1969/ms, 'Should not display 12/31/1969');
 
 # Cleanup.
diff --git a/test/bug.360.t b/test/bug.360.t
index 54a2f840e..b73aec2c9 100755
--- a/test/bug.360.t
+++ b/test/bug.360.t
@@ -40,28 +40,28 @@ if (open my $fh, '>', 'bug.rc')
 }
 
 # Setup: Add a recurring task, generate an instance, then add a project.
-qx{../task rc:bug.rc add foo due:tomorrow recur:daily};
-qx{../task rc:bug.rc ls};
+qx{../src/task rc:bug.rc add foo due:tomorrow recur:daily};
+qx{../src/task rc:bug.rc ls};
 
 # Result: trying to add the project generates an error about removing
 # recurrence from a task.
-my $output = qx{../task rc:bug.rc 1 project:bar};
+my $output = qx{../src/task rc:bug.rc 1 project:bar};
 unlike ($output, qr/You cannot remove the recurrence from a recurring task./ms, 'No recurrence removal error');
 
 # Now try to generate the error above via regular means - ie, is it actually
 # doing what it should?
-$output = qx{../task rc:bug.rc 1 recur:};
+$output = qx{../src/task rc:bug.rc 1 recur:};
 like ($output, qr/You cannot remove the recurrence from a recurring task./ms, 'Recurrence removal error');
 
 # Prevent removal of the due date from a recurring task.
-$output = qx{../task rc:bug.rc 1 due:};
+$output = qx{../src/task rc:bug.rc 1 due:};
 like ($output, qr/You cannot remove the due date from a recurring task./ms, 'Cannot remove due date from a recurring task');
 
 # Allow removal of the due date from a non-recurring task.
-qx{../task rc:bug.rc add nonrecurring};
-$output = qx{../task rc:bug.rc ls};
+qx{../src/task rc:bug.rc add nonrecurring};
+$output = qx{../src/task rc:bug.rc ls};
 my ($id) = $output =~ /(\d+)\s+nonrecurring/;
-$output = qx{../task rc:bug.rc $id due:};
+$output = qx{../src/task rc:bug.rc $id due:};
 unlike ($output, qr/You cannot remove the due date from a recurring task./ms, 'Can remove due date from a non-recurring task');
 
 # Cleanup.
diff --git a/test/bug.368.t b/test/bug.368.t
index c28a4bf59..fcb1d050c 100755
--- a/test/bug.368.t
+++ b/test/bug.368.t
@@ -41,8 +41,8 @@ if (open my $fh, '>', 'bug.rc')
 }
 
 # Setup: Add a recurring task, generate an instance, then add a project.
-qx{../task rc:bug.rc add foo due:today recur:daily until:eom};
-my $output = qx{../task rc:bug.rc info 1};
+qx{../src/task rc:bug.rc add foo due:today recur:daily until:eom};
+my $output = qx{../src/task rc:bug.rc info 1};
 
 # Result: Make sure the 'until' date is rendered as a date, not an epoch.
 unlike ($output, qr/Recur until\s+\d{10}/,          'until is not shown as an epoch');
diff --git a/test/bug.414.t b/test/bug.414.t
index 465f67c6b..7e8f52e70 100755
--- a/test/bug.414.t
+++ b/test/bug.414.t
@@ -41,19 +41,19 @@ if (open my $fh, '>', 'bug.rc')
 # Bug #414: Tags filtering not working with unicode characters
 
 # Add a task with a UTF-8 tag.
-qx{../task rc:bug.rc add one +osobní};
-my $output = qx{../task rc:bug.rc ls +osobní};
+qx{../src/task rc:bug.rc add one +osobní};
+my $output = qx{../src/task rc:bug.rc ls +osobní};
 like ($output, qr/one/, 'found UTF8 tag osobní');
 
-$output = qx{../task rc:bug.rc ls -osobní};
+$output = qx{../src/task rc:bug.rc ls -osobní};
 unlike ($output, qr/one/, 'not found UTF8 tag osobní');
 
 # And a different one
-qx{../task rc:bug.rc add two +föo};
-$output = qx{../task rc:bug.rc ls +föo};
+qx{../src/task rc:bug.rc add two +föo};
+$output = qx{../src/task rc:bug.rc ls +föo};
 like ($output, qr/two/, 'found UTF8 tag föo');
 
-$output = qx{../task rc:bug.rc ls -föo};
+$output = qx{../src/task rc:bug.rc ls -föo};
 unlike ($output, qr/two/, 'not found UTF8 tag föo');
 
 # Cleanup.
diff --git a/test/bug.417.t b/test/bug.417.t
index 709038735..2980ec718 100755
--- a/test/bug.417.t
+++ b/test/bug.417.t
@@ -40,14 +40,14 @@ if (open my $fh, '>', 'bug.rc')
 }
 
 # Bug #417: Sorting by countdown_compact not working
-qx{../task rc:bug.rc add due:yesterday before};
-qx{../task rc:bug.rc add due:today     now};
-qx{../task rc:bug.rc add due:tomorrow  after};
+qx{../src/task rc:bug.rc add due:yesterday before};
+qx{../src/task rc:bug.rc add due:today     now};
+qx{../src/task rc:bug.rc add due:tomorrow  after};
 
-my $output = qx{../task rc:bug.rc rc.report.long.sort:countdown+ long};
+my $output = qx{../src/task rc:bug.rc rc.report.long.sort:countdown+ long};
 like ($output, qr/before.+now.+after/ms, 'rc.report.long.sort:countdown+ works');
 
-$output = qx{../task rc:bug.rc rc.report.long.sort:countdown- long};
+$output = qx{../src/task rc:bug.rc rc.report.long.sort:countdown- long};
 like ($output, qr/after.+now.+before/ms, 'rc.report.long.sort:countdown- works');
 
 # Cleanup.
diff --git a/test/bug.418.t b/test/bug.418.t
index 35a06bbaa..f071ae2c7 100755
--- a/test/bug.418.t
+++ b/test/bug.418.t
@@ -47,17 +47,17 @@ if (open my $fh, '>', 'bug.rc')
 
 # Bug #418: due.before:eow not working
 #   - with dateformat is MD
-qx{../task rc:bug.rc add one   due:6/28/2010};
-qx{../task rc:bug.rc add two   due:6/29/2010};
-qx{../task rc:bug.rc add three due:6/30/2010};
-qx{../task rc:bug.rc add four  due:7/1/2010};
-qx{../task rc:bug.rc add five  due:7/2/2010};
-qx{../task rc:bug.rc add six   due:7/3/2010};
-qx{../task rc:bug.rc add seven due:7/4/2010};
-qx{../task rc:bug.rc add eight due:7/5/2010};
-qx{../task rc:bug.rc add nine  due:7/6/2010};
+qx{../src/task rc:bug.rc add one   due:6/28/2010};
+qx{../src/task rc:bug.rc add two   due:6/29/2010};
+qx{../src/task rc:bug.rc add three due:6/30/2010};
+qx{../src/task rc:bug.rc add four  due:7/1/2010};
+qx{../src/task rc:bug.rc add five  due:7/2/2010};
+qx{../src/task rc:bug.rc add six   due:7/3/2010};
+qx{../src/task rc:bug.rc add seven due:7/4/2010};
+qx{../src/task rc:bug.rc add eight due:7/5/2010};
+qx{../src/task rc:bug.rc add nine  due:7/6/2010};
 
-my $output = qx{../task rc:bug.rc foo};
+my $output = qx{../src/task rc:bug.rc foo};
 like ($output, qr/one/ms,     'task 1 listed');
 like ($output, qr/two/ms,     'task 2 listed');
 like ($output, qr/three/ms,   'task 3 listed');
@@ -68,7 +68,7 @@ like ($output, qr/seven/ms,   'task 7 listed');
 like ($output, qr/eight/ms,   'task 8 listed');
 like ($output, qr/nine/ms,    'task 9 listed');
 
-$output = qx{../task rc:bug.rc foo due.before:7/2/2010};
+$output = qx{../src/task rc:bug.rc foo due.before:7/2/2010};
 like ($output, qr/one/ms,     'task 1 listed');
 like ($output, qr/two/ms,     'task 2 listed');
 like ($output, qr/three/ms,   'task 3 listed');
diff --git a/test/bug.425.x b/test/bug.425.x
index 58c0ea5e9..4ac692ae7 100755
--- a/test/bug.425.x
+++ b/test/bug.425.x
@@ -44,10 +44,10 @@ if (open my $fh, '>', '425.rc')
 # Create a task and attempt to revise the description to include the word 'in'
 # (this breaks in 1.9.3 and earlier)
 
-qx{../task rc:425.rc add Foo};
-qx{../task rc:425.rc 1 Bar in Bar};
+qx{../src/task rc:425.rc add Foo};
+qx{../src/task rc:425.rc 1 Bar in Bar};
 
-my $output = qx{../task rc:425.rc 1 ls};
+my $output = qx{../src/task rc:425.rc 1 ls};
 
 like ($output, qr/1\s+Bar in Bar/m, 'parser - interpret \'in\' in description');
 
diff --git a/test/bug.434.t b/test/bug.434.t
index c922d114e..378938aa4 100755
--- a/test/bug.434.t
+++ b/test/bug.434.t
@@ -41,8 +41,8 @@ if (open my $fh, '>', 'bug.rc')
 # Bug #434: Task shouldn't prevent users from marking as done tasks with status:waiting
 
 # Add a task that is waiting
-qx{../task rc:bug.rc add One wait:tomorrow};
-my $output = qx{../task rc:bug.rc do 1};
+qx{../src/task rc:bug.rc add One wait:tomorrow};
+my $output = qx{../src/task rc:bug.rc do 1};
 like ($output, qr/Marked 1 task as done\./, 'Waiting task marked completed');
 
 # Cleanup.
diff --git a/test/bug.438.t b/test/bug.438.t
index 2009d4d5f..117df222d 100755
--- a/test/bug.438.t
+++ b/test/bug.438.t
@@ -45,39 +45,39 @@ if (open my $fh, '>', 'bug.rc')
 #           time is included.
 
 # Ensure the two tasks have a 1 second delta in entry.
-qx{../task rc:bug.rc add older};
+qx{../src/task rc:bug.rc add older};
 diag ("1 second delay");
 sleep 1;
-qx{../task rc:bug.rc add newer};
+qx{../src/task rc:bug.rc add newer};
 
-my $output = qx{../task rc:bug.rc rc.report.foo.sort:entry+ foo};
+my $output = qx{../src/task rc:bug.rc rc.report.foo.sort:entry+ foo};
 like ($output, qr/older.+newer/ms, 'sort:entry+ -> older newer');
 
-$output = qx{../task rc:bug.rc rc.report.foo.sort:entry- foo};
+$output = qx{../src/task rc:bug.rc rc.report.foo.sort:entry- foo};
 like ($output, qr/newer.+older/ms, 'sort:entry- -> newer older');
 
 # Ensure the two tasks have a 1 second delta in start.
-qx{../task rc:bug.rc start 1};
+qx{../src/task rc:bug.rc start 1};
 diag ("1 second delay");
 sleep 1;
-qx{../task rc:bug.rc start 2};
+qx{../src/task rc:bug.rc start 2};
 
-$output = qx{../task rc:bug.rc rc.report.foo.sort:start+ foo};
+$output = qx{../src/task rc:bug.rc rc.report.foo.sort:start+ foo};
 like ($output, qr/older.+newer/ms, 'sort:start+ -> older newer');
 
-$output = qx{../task rc:bug.rc rc.report.foo.sort:start- foo};
+$output = qx{../src/task rc:bug.rc rc.report.foo.sort:start- foo};
 like ($output, qr/newer.+older/ms, 'sort:start- -> newer older');
 
 # Ensure the two tasks have a 1 second delta in end.
-qx{../task rc:bug.rc done 1};
+qx{../src/task rc:bug.rc done 1};
 diag ("1 second delay");
 sleep 1;
-qx{../task rc:bug.rc done 2};
+qx{../src/task rc:bug.rc done 2};
 
-$output = qx{../task rc:bug.rc rc.report.foo.sort:end+ foo};
+$output = qx{../src/task rc:bug.rc rc.report.foo.sort:end+ foo};
 like ($output, qr/older.+newer/ms, 'sort:end+ -> older newer');
 
-$output = qx{../task rc:bug.rc rc.report.foo.sort:end- foo};
+$output = qx{../src/task rc:bug.rc rc.report.foo.sort:end- foo};
 like ($output, qr/newer.+older/ms, 'sort:end- -> newer older');
 
 # Cleanup.
diff --git a/test/bug.440.t b/test/bug.440.t
index 34125614a..e12087373 100755
--- a/test/bug.440.t
+++ b/test/bug.440.t
@@ -43,14 +43,14 @@ if (open my $fh, '>', '440.rc')
 
 # Create a task and attempt simultaneous subst and appends, both permutations
 
-qx{../task rc:440.rc add Foo};
-qx{../task rc:440.rc add Foo};
+qx{../src/task rc:440.rc add Foo};
+qx{../src/task rc:440.rc add Foo};
 
-qx{../task rc:440.rc 1 /Foo/Bar/ append Appendtext};
-qx{../task rc:440.rc 2 append Appendtext /Foo/Bar/};
+qx{../src/task rc:440.rc 1 /Foo/Bar/ append Appendtext};
+qx{../src/task rc:440.rc 2 append Appendtext /Foo/Bar/};
 
-my $output1 = qx{../task rc:440.rc 1 ls};
-my $output2 = qx{../task rc:440.rc 2 ls};
+my $output1 = qx{../src/task rc:440.rc 1 ls};
+my $output2 = qx{../src/task rc:440.rc 2 ls};
 
 unlike ($output1, qr/Foo/, 'simultaneous subst and append - subst');
 like ($output1, qr/\w+ Appendtext/, 'simultaneous subst and append - append');
diff --git a/test/bug.441.t b/test/bug.441.t
index 134453cfe..675db0fb8 100755
--- a/test/bug.441.t
+++ b/test/bug.441.t
@@ -41,9 +41,9 @@ if (open my $fh, '>', '441.rc')
 }
 
 # Bug #441: A colon messes up text replacement with ///
-qx{../task rc:441.rc add one two three};
-qx{../task rc:441.rc 1 /two/two:/};
-my $output = qx{../task rc:441.rc ls};
+qx{../src/task rc:441.rc add one two three};
+qx{../src/task rc:441.rc 1 /two/two:/};
+my $output = qx{../src/task rc:441.rc ls};
 like ($output, qr/one two: three/ms, 'Substitution with colon worked');
 
 # Cleanup.
diff --git a/test/bug.455.t b/test/bug.455.t
index 35b5b5d6c..61eb42b22 100755
--- a/test/bug.455.t
+++ b/test/bug.455.t
@@ -41,10 +41,10 @@ if (open my $fh, '>', '455.rc')
 
 # Bug #455 - Text alignment in reports is broken when text contains utf8 characters
 
-qx{../task rc:455.rc add abc pro:Bar\x{263A}};
-qx{../task rc:455.rc add def pro:Foo!};
+qx{../src/task rc:455.rc add abc pro:Bar\x{263A}};
+qx{../src/task rc:455.rc add def pro:Foo!};
 
-my $output = qx{../task rc:455.rc ls};
+my $output = qx{../src/task rc:455.rc ls};
 
 like ($output, qr/\s{7}abc/ms, 'bug 455 - correct spacing in utf8 task');
 like ($output, qr/\s{7}def/ms, 'bug 455 - correct spacing in non utf8 task');
diff --git a/test/bug.466.t b/test/bug.466.t
index 42eb4d9a6..d3bca5c07 100755
--- a/test/bug.466.t
+++ b/test/bug.466.t
@@ -43,7 +43,7 @@ if (open my $fh, '>', '466.rc')
 }
 
 # Bug #466 - wrong error message when sort key missing +/-
-my $output = qx{../task rc:466.rc foo};
+my $output = qx{../src/task rc:466.rc foo};
 like ($output, qr/Sort column 'id' does not have a \+\/- ascending\/descending indicator\./,
       'Error on missing sort direction');
 
diff --git a/test/bug.480.t b/test/bug.480.t
index 73fa104cc..f1937f298 100755
--- a/test/bug.480.t
+++ b/test/bug.480.t
@@ -40,82 +40,82 @@ if (open my $fh, '>', 'bug.rc')
 }
 
 # Bug #480 - putting a '@' character in tags breaks filters.
-qx{../task rc:bug.rc add one +ordinary};
-qx{../task rc:bug.rc add two +\@strange};
+qx{../src/task rc:bug.rc add one +ordinary};
+qx{../src/task rc:bug.rc add two +\@strange};
 
-my $output = qx{../task rc:bug.rc long +ordinary};
+my $output = qx{../src/task rc:bug.rc long +ordinary};
 like ($output,   qr/one/, '+ordinary explicitly included');
 unlike ($output, qr/two/, '@strange implicitly excluded');
 
-$output = qx{../task rc:bug.rc long -ordinary};
+$output = qx{../src/task rc:bug.rc long -ordinary};
 unlike ($output, qr/one/, '-ordinary explicitly excluded');
 like ($output,   qr/two/, '@strange implicitly included');
 
-$output = qx{../task rc:bug.rc long +\@strange};
+$output = qx{../src/task rc:bug.rc long +\@strange};
 unlike ($output, qr/one/, '-ordinary implicitly excluded');
 like ($output,   qr/two/, '@strange explicitly included');
 
-$output = qx{../task rc:bug.rc long -\@strange};
+$output = qx{../src/task rc:bug.rc long -\@strange};
 like ($output,   qr/one/, '+ordinary implicitly included');
 unlike ($output, qr/two/, '@strange explicitly excluded');
 
 # Bug #XXX - '-t1 -t2' doesn't seem to work, when @ characters are involved.
 unlink 'pending.data';
-qx{../task rc:bug.rc add one   +t1};
-qx{../task rc:bug.rc add two   +t2};
-qx{../task rc:bug.rc add three +t3};
+qx{../src/task rc:bug.rc add one   +t1};
+qx{../src/task rc:bug.rc add two   +t2};
+qx{../src/task rc:bug.rc add three +t3};
 
-$output = qx{../task rc:bug.rc list -t1};
+$output = qx{../src/task rc:bug.rc list -t1};
 unlike ($output, qr/one/,   'Single: no t1');
 like   ($output, qr/two/,   'Single: yes t2');
 like   ($output, qr/three/, 'Single: yes t3');
 
-$output = qx{../task rc:bug.rc list -t1 -t2};
+$output = qx{../src/task rc:bug.rc list -t1 -t2};
 unlike ($output, qr/one/,   'Double: no t1');
 unlike ($output, qr/two/,   'Double: no t2');
 like   ($output, qr/three/, 'Double: yes t3');
 
-$output = qx{../task rc:bug.rc list -t1 -t2 -t3};
+$output = qx{../src/task rc:bug.rc list -t1 -t2 -t3};
 unlike ($output, qr/one/,   'Triple: no t1');
 unlike ($output, qr/two/,   'Triple: no t2');
 unlike ($output, qr/three/, 'Triple: no t3');
 
 # Once again, with @ characters.
-qx{../task rc:bug.rc 1 +\@1};
-qx{../task rc:bug.rc 2 +\@2};
-qx{../task rc:bug.rc 3 +\@3};
+qx{../src/task rc:bug.rc 1 +\@1};
+qx{../src/task rc:bug.rc 2 +\@2};
+qx{../src/task rc:bug.rc 3 +\@3};
 
-$output = qx{../task rc:bug.rc list -\@1};
+$output = qx{../src/task rc:bug.rc list -\@1};
 unlike ($output, qr/one/,   'Single: no @1');
 like   ($output, qr/two/,   'Single: yes @2');
 like   ($output, qr/three/, 'Single: yes @3');
 
-$output = qx{../task rc:bug.rc list -\@1 -\@2};
+$output = qx{../src/task rc:bug.rc list -\@1 -\@2};
 unlike ($output, qr/one/,   'Double: no @1');
 unlike ($output, qr/two/,   'Double: no @2');
 like   ($output, qr/three/, 'Double: yes @3');
 
-$output = qx{../task rc:bug.rc list -\@1 -\@2 -\@3};
+$output = qx{../src/task rc:bug.rc list -\@1 -\@2 -\@3};
 unlike ($output, qr/one/,   'Triple: no @1');
 unlike ($output, qr/two/,   'Triple: no @2');
 unlike ($output, qr/three/, 'Triple: no @3');
 
 # Once again, with @ characters and punctuation.
-qx{../task rc:bug.rc 1 +\@foo.1};
-qx{../task rc:bug.rc 2 +\@foo.2};
-qx{../task rc:bug.rc 3 +\@foo.3};
+qx{../src/task rc:bug.rc 1 +\@foo.1};
+qx{../src/task rc:bug.rc 2 +\@foo.2};
+qx{../src/task rc:bug.rc 3 +\@foo.3};
 
-$output = qx{../task rc:bug.rc list -\@foo.1};
+$output = qx{../src/task rc:bug.rc list -\@foo.1};
 unlike ($output, qr/one/,   'Single: no @foo.1');
 like   ($output, qr/two/,   'Single: yes @foo.2');
 like   ($output, qr/three/, 'Single: yes @foo.3');
 
-$output = qx{../task rc:bug.rc list -\@foo.1 -\@foo.2};
+$output = qx{../src/task rc:bug.rc list -\@foo.1 -\@foo.2};
 unlike ($output, qr/one/,   'Double: no @foo.1');
 unlike ($output, qr/two/,   'Double: no @foo.2');
 like   ($output, qr/three/, 'Double: yes @foo.3');
 
-$output = qx{../task rc:bug.rc list -\@foo.1 -\@foo.2 -\@foo.3};
+$output = qx{../src/task rc:bug.rc list -\@foo.1 -\@foo.2 -\@foo.3};
 unlike ($output, qr/one/,   'Triple: no @foo.1');
 unlike ($output, qr/two/,   'Triple: no @foo.2');
 unlike ($output, qr/three/, 'Triple: no @foo.3');
diff --git a/test/bug.485.x b/test/bug.485.x
index ed91eaf76..14a4a16c9 100755
--- a/test/bug.485.x
+++ b/test/bug.485.x
@@ -40,13 +40,13 @@ if (open my $fh, '>', 'bug.rc')
 }
 
 # Bug #485 - 'task list recur:month' doesn't list monthly tasks
-qx{../task rc:bug.rc add one due:tomorrow recur:monthly};
-qx{../task rc:bug.rc add two due:tomorrow recur:month};
-my $output = qx{../task rc:bug.rc list recur:monthly};
+qx{../src/task rc:bug.rc add one due:tomorrow recur:monthly};
+qx{../src/task rc:bug.rc add two due:tomorrow recur:month};
+my $output = qx{../src/task rc:bug.rc list recur:monthly};
 like ($output, qr/one/, 'monthly -> monthly');
 like ($output, qr/two/, 'month   -> monthly');
 
-$output = qx{../task rc:bug.rc list recur:month};
+$output = qx{../src/task rc:bug.rc list recur:month};
 like ($output, qr/one/, 'monthly -> month');
 like ($output, qr/two/, 'month   -> month');
 
diff --git a/test/bug.489.t b/test/bug.489.t
index 7ba3ff74f..33a0306b8 100755
--- a/test/bug.489.t
+++ b/test/bug.489.t
@@ -40,9 +40,9 @@ if (open my $fh, '>', 'bug.rc')
 }
 
 # Bug #489 - tags.none: is not filtering tagless tasks
-qx{../task rc:bug.rc add with +tag};
-qx{../task rc:bug.rc add without};
-my $output = qx{../task rc:bug.rc list tags.none:};
+qx{../src/task rc:bug.rc add with +tag};
+qx{../src/task rc:bug.rc add without};
+my $output = qx{../src/task rc:bug.rc list tags.none:};
 unlike ($output, qr/with /,    'tags.none: skips tagged');
 like   ($output, qr/without/, 'tags.none: finds tagless');
 
diff --git a/test/bug.495.t b/test/bug.495.t
index a53b623aa..71b0cf1af 100755
--- a/test/bug.495.t
+++ b/test/bug.495.t
@@ -40,9 +40,9 @@ if (open my $fh, '>', 'bug.rc')
 }
 
 # Bug #495 - double hyphen mishandled for annotations.
-qx{../task rc:bug.rc add foo};
-qx{../task rc:bug.rc 1 annotate "This -- is -- a -- test"};
-my $output = qx{../task rc:bug.rc list};
+qx{../src/task rc:bug.rc add foo};
+qx{../src/task rc:bug.rc 1 annotate "This -- is -- a -- test"};
+my $output = qx{../src/task rc:bug.rc list};
 like ($output, qr/This -- is -- a -- test/, 'Double hyphens preserved.');
 
 # Cleanup.
diff --git a/test/bug.555.t b/test/bug.555.t
index 23eda8598..b61f5818d 100755
--- a/test/bug.555.t
+++ b/test/bug.555.t
@@ -40,7 +40,7 @@ if (open my $fh, '>', 'bug.rc')
 }
 
 # Bug #555 - log with a project segfaults.
-my $output = qx{../task rc:bug.rc log description project:p};
+my $output = qx{../src/task rc:bug.rc log description project:p};
 unlike ($output, qr/Segmentation fault/, 'no segfault from log with project');
 
 # Cleanup.
diff --git a/test/bug.580.t b/test/bug.580.t
index c5db8d279..53c413267 100755
--- a/test/bug.580.t
+++ b/test/bug.580.t
@@ -61,15 +61,15 @@ if (open my $fh, '>', 'remote.rc')
 }
 
 # add a remote task
-qx{../task rc:remote.rc add remote task};
+qx{../src/task rc:remote.rc add remote task};
 
 # add a local task
-qx(../task rc:local.rc add local task);
+qx(../src/task rc:local.rc add local task);
 
 # merge and autopush
-qx{../task rc:local.rc merge};
+qx{../src/task rc:local.rc merge};
 
-my $output = qx{../task rc:remote.rc ls};
+my $output = qx{../src/task rc:remote.rc ls};
 like ($output, qr/local task/,    "autopush failed");
 
 # Cleanup.
diff --git a/test/bug.annotate.t b/test/bug.annotate.t
index 3dc0d2c73..bffb44462 100755
--- a/test/bug.annotate.t
+++ b/test/bug.annotate.t
@@ -39,12 +39,12 @@ if (open my $fh, '>', 'bug_annotate.rc')
 }
 
 # Attempt a blank annotation.
-qx{../task rc:bug_annotate.rc add foo};
-my $output = qx{../task rc:bug_annotate.rc 1 annotate};
+qx{../src/task rc:bug_annotate.rc add foo};
+my $output = qx{../src/task rc:bug_annotate.rc 1 annotate};
 like ($output, qr/Cannot apply a blank annotation./, 'failed on blank annotation');
 
 # Attempt an annotation without ID
-$output = qx{../task rc:bug_annotate.rc annotate bar};
+$output = qx{../src/task rc:bug_annotate.rc annotate bar};
 like ($output, qr/ID needed to apply an annotation./, 'failed on annotation without ID');
 
 # Cleanup.
diff --git a/test/bug.annual.t b/test/bug.annual.t
index a50f8cebe..b8ac6b138 100755
--- a/test/bug.annual.t
+++ b/test/bug.annual.t
@@ -55,8 +55,8 @@ if (open my $fh, '>', 'annual.rc')
 # 10             12/29/2008          - foo
 # 11             12/29/2009          - foo
 
-qx{../task rc:annual.rc add foo due:1/1/2000 recur:annual until:1/1/2009};
-my $output = qx{../task rc:annual.rc list};
+qx{../src/task rc:annual.rc add foo due:1/1/2000 recur:annual until:1/1/2009};
+my $output = qx{../src/task rc:annual.rc list};
 like ($output, qr/1\s+1\/1\/2000\s+(?:-|\d+\ssecs?)\s+foo/,  'synthetic 1 no creep');
 like ($output, qr/2\s+1\/1\/2001\s+(?:-|\d+\ssecs?)\s+foo/,  'synthetic 2 no creep');
 like ($output, qr/3\s+1\/1\/2002\s+(?:-|\d+\ssecs?)\s+foo/,  'synthetic 3 no creep');
diff --git a/test/bug.before.t b/test/bug.before.t
index f796ce05c..d15dd8a2c 100755
--- a/test/bug.before.t
+++ b/test/bug.before.t
@@ -55,28 +55,28 @@ EOF
 }
 
 # Verify data is readable and just as expected.
-my $output = qx{../task rc:before.rc 1 info};
+my $output = qx{../src/task rc:before.rc 1 info};
 like ($output, qr/Start\s+12\/22\/2008/, 'task 1 start date as expected');
 
-$output = qx{../task rc:before.rc 2 info};
+$output = qx{../src/task rc:before.rc 2 info};
 like ($output, qr/Start\s+4\/17\/2009/, 'task 2 start date as expected');
 
-$output = qx{../task rc:before.rc ls start.before:12/1/2008};
+$output = qx{../src/task rc:before.rc ls start.before:12/1/2008};
 unlike ($output, qr/foo/, 'no foo before 12/1/2008');
 unlike ($output, qr/bar/, 'no bar before 12/1/2008');
-$output = qx{../task rc:before.rc ls start.before:1/1/2009};
+$output = qx{../src/task rc:before.rc ls start.before:1/1/2009};
 like ($output, qr/foo/, 'foo before 1/1/2009');
 unlike ($output, qr/bar/, 'no bar before 1/1/2009');
-$output = qx{../task rc:before.rc ls start.before:5/1/2009};
+$output = qx{../src/task rc:before.rc ls start.before:5/1/2009};
 like ($output, qr/foo/, 'foo before 5/1/2009');
 like ($output, qr/bar/, 'bar before 5/1/2009');
-$output = qx{../task rc:before.rc ls start.after:12/1/2008};
+$output = qx{../src/task rc:before.rc ls start.after:12/1/2008};
 like ($output, qr/foo/, 'foo after 12/1/2008');
 like ($output, qr/bar/, 'bar after 12/1/2008');
-$output = qx{../task rc:before.rc ls start.after:1/1/2009};
+$output = qx{../src/task rc:before.rc ls start.after:1/1/2009};
 unlike ($output, qr/foo/, 'no foo after 1/1/2009');
 like ($output, qr/bar/, 'bar after 1/1/2009');
-$output = qx{../task rc:before.rc ls start.after:5/1/2009};
+$output = qx{../src/task rc:before.rc ls start.after:5/1/2009};
 unlike ($output, qr/foo/, 'no foo after 5/1/2009');
 unlike ($output, qr/bar/, 'no bar after 5/1/2009');
 
diff --git a/test/bug.bulk.t b/test/bug.bulk.t
index 42c3050c9..8ae9529a9 100755
--- a/test/bug.bulk.t
+++ b/test/bug.bulk.t
@@ -42,30 +42,30 @@ if (open my $fh, '>', 'bulk.rc')
 
 # Add some tasks with project, prioriy and due date, some with only due date.
 # Bulk add a project and priority to the tasks that were without.
-qx{../task rc:bulk.rc add t1 pro:p1 pri:H due:monday};
-qx{../task rc:bulk.rc add t2 pro:p1 pri:M due:tuesday};
-qx{../task rc:bulk.rc add t3 pro:p1 pri:L due:wednesday};
-qx{../task rc:bulk.rc add t4              due:thursday};
-qx{../task rc:bulk.rc add t5              due:friday};
-qx{../task rc:bulk.rc add t6              due:saturday};
+qx{../src/task rc:bulk.rc add t1 pro:p1 pri:H due:monday};
+qx{../src/task rc:bulk.rc add t2 pro:p1 pri:M due:tuesday};
+qx{../src/task rc:bulk.rc add t3 pro:p1 pri:L due:wednesday};
+qx{../src/task rc:bulk.rc add t4              due:thursday};
+qx{../src/task rc:bulk.rc add t5              due:friday};
+qx{../src/task rc:bulk.rc add t6              due:saturday};
 
-my $output = qx{echo "quit"|../task rc:bulk.rc pro:p1 pri:M 4 5 6};
+my $output = qx{echo "quit"|../src/task rc:bulk.rc pro:p1 pri:M 4 5 6};
 like ($output, qr/Modified 0 tasks/, '"quit" prevents any further modifications');
 
-$output = qx{echo "All"|../task rc:bulk.rc pro:p1 pri:M 4 5 6};
+$output = qx{echo "All"|../src/task rc:bulk.rc pro:p1 pri:M 4 5 6};
 unlike ($output, qr/Task 4 "t4"\n  - No changes were made/, 'Task 4 modified');
 unlike ($output, qr/Task 5 "t5"\n  - No changes were made/, 'Task 5 modified');
 unlike ($output, qr/Task 6 "t6"\n  - No changes were made/, 'Task 6 modified');
 
-$output = qx{../task rc:bulk.rc info 4};
+$output = qx{../src/task rc:bulk.rc info 4};
 like ($output, qr/Project\s+p1/, 'project applied to 4');
 like ($output, qr/Priority\s+M/, 'priority applied to 4');
 
-$output = qx{../task rc:bulk.rc info 5};
+$output = qx{../src/task rc:bulk.rc info 5};
 like ($output, qr/Project\s+p1/, 'project applied to 5');
 like ($output, qr/Priority\s+M/, 'priority applied to 5');
 
-$output = qx{../task rc:bulk.rc info 6};
+$output = qx{../src/task rc:bulk.rc info 6};
 like ($output, qr/Project\s+p1/, 'project applied to 6');
 like ($output, qr/Priority\s+M/, 'priority applied to 6');
 
diff --git a/test/bug.cal.t b/test/bug.cal.t
index 49a3307b9..5f2a83a55 100755
--- a/test/bug.cal.t
+++ b/test/bug.cal.t
@@ -42,65 +42,65 @@ if (open my $fh, '>', 'cal.rc')
 # Bug: The 'cal' command can fail when provided with challenging arguments.
 
 # Should not fail (because they are correct):
-my $output = qx{../task rc:cal.rc cal 2>&1};
+my $output = qx{../src/task rc:cal.rc cal 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal');
 
 # y due 2010 donkey 8
-$output = qx{../task rc:cal.rc cal y 2>&1};
+$output = qx{../src/task rc:cal.rc cal y 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y');
-$output = qx{../task rc:cal.rc cal 8 2>&1};
+$output = qx{../src/task rc:cal.rc cal 8 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8');
-$output = qx{../task rc:cal.rc cal due 2>&1};
+$output = qx{../src/task rc:cal.rc cal due 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal due');
-$output = qx{../task rc:cal.rc cal 2010 2>&1};
+$output = qx{../src/task rc:cal.rc cal 2010 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 2010');
-$output = qx{../task rc:cal.rc cal donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal donkey');
 
 # y due 2010 donkey 8
-$output = qx{../task rc:cal.rc cal y due 2>&1};
+$output = qx{../src/task rc:cal.rc cal y due 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y due');
-$output = qx{../task rc:cal.rc cal y 8 2>&1};
+$output = qx{../src/task rc:cal.rc cal y 8 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 8');
-$output = qx{../task rc:cal.rc cal y 2010 2>&1};
+$output = qx{../src/task rc:cal.rc cal y 2010 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 2010');
-$output = qx{../task rc:cal.rc cal y donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal y donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y donkey');
-$output = qx{../task rc:cal.rc cal 8 due 2>&1};
+$output = qx{../src/task rc:cal.rc cal 8 due 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 due');
-$output = qx{../task rc:cal.rc cal 8 2010 2>&1};
+$output = qx{../src/task rc:cal.rc cal 8 2010 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 2010');
-$output = qx{../task rc:cal.rc cal 8 donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal 8 donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 donkey');
-$output = qx{../task rc:cal.rc cal due 2010 2>&1};
+$output = qx{../src/task rc:cal.rc cal due 2010 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal due 2010');
-$output = qx{../task rc:cal.rc cal due donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal due donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal due donkey');
-$output = qx{../task rc:cal.rc cal 2010 donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal 2010 donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 2010 donkey');
 
 # y 8 due 2010 donkey
-$output = qx{../task rc:cal.rc cal y 8 due 2>&1};
+$output = qx{../src/task rc:cal.rc cal y 8 due 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 8 due');
-$output = qx{../task rc:cal.rc cal y 8 2010 2>&1};
+$output = qx{../src/task rc:cal.rc cal y 8 2010 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 8 2010');
-$output = qx{../task rc:cal.rc cal y 8 donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal y 8 donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 8 donkey');
-$output = qx{../task rc:cal.rc cal y due 2010 2>&1};
+$output = qx{../src/task rc:cal.rc cal y due 2010 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y due 2010');
-$output = qx{../task rc:cal.rc cal y due donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal y due donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y due donkey');
-$output = qx{../task rc:cal.rc cal y 2010 donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal y 2010 donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal y 2010 donkey');
-$output = qx{../task rc:cal.rc cal 8 due 2010 2>&1};
+$output = qx{../src/task rc:cal.rc cal 8 due 2010 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 due 2010');
-$output = qx{../task rc:cal.rc cal 8 due donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal 8 due donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 due donkey');
-$output = qx{../task rc:cal.rc cal 8 2010 donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal 8 2010 donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal 8 2010 donkey');
-$output = qx{../task rc:cal.rc cal due 2010 8 2>&1};
+$output = qx{../src/task rc:cal.rc cal due 2010 8 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal due 2010 8');
-$output = qx{../task rc:cal.rc cal due 2010 donkey 2>&1};
+$output = qx{../src/task rc:cal.rc cal due 2010 donkey 2>&1};
 unlike ($output, qr/(?:Assertion failed|Could note recognize|not a valid)/, 'cal due 2010 donkey');
 
 # Cleanup.
diff --git a/test/bug.concat.t b/test/bug.concat.t
index aad74e3c4..1a656e1c3 100755
--- a/test/bug.concat.t
+++ b/test/bug.concat.t
@@ -47,12 +47,12 @@ if (open my $fh, '>', 'bug_concat.rc')
 #
 #   Thisisanewdescription
 
-qx{../task rc:bug_concat.rc add This is the original text};
-my $output = qx{../task rc:bug_concat.rc info 1};
+qx{../src/task rc:bug_concat.rc add This is the original text};
+my $output = qx{../src/task rc:bug_concat.rc info 1};
 like ($output, qr/Description\s+This is the original text\n/, 'original correct');
 
-qx{../task rc:bug_concat.rc 1 This is the modified text};
-$output = qx{../task rc:bug_concat.rc info 1};
+qx{../src/task rc:bug_concat.rc 1 This is the modified text};
+$output = qx{../src/task rc:bug_concat.rc info 1};
 like ($output, qr/Description\s+This is the modified text\n/, 'modified correct');
 
 # When a task is added like this:
@@ -63,8 +63,8 @@ like ($output, qr/Description\s+This is the modified text\n/, 'modified correct'
 #
 #   aaabbb:ccc ddd
 
-qx{../task rc:bug_concat.rc add aaa bbb:ccc ddd};
-$output = qx{../task rc:bug_concat.rc info 2};
+qx{../src/task rc:bug_concat.rc add aaa bbb:ccc ddd};
+$output = qx{../src/task rc:bug_concat.rc info 2};
 like ($output, qr/Description\s+aaa bbb:ccc ddd\n/, 'properly concatenated');
 
 # Cleanup.
diff --git a/test/bug.hang.t b/test/bug.hang.t
index 3c734f636..723727f0a 100755
--- a/test/bug.hang.t
+++ b/test/bug.hang.t
@@ -56,9 +56,9 @@ eval
 {
   $SIG{'ALRM'} = sub {die "alarm\n"};
   alarm 10;
-  my $output = qx{../task rc:hang.rc list;
-                  ../task rc:hang.rc add due:today recur:1d infinite loop;
-                  ../task rc:hang.rc info 1};
+  my $output = qx{../src/task rc:hang.rc list;
+                  ../src/task rc:hang.rc add due:today recur:1d infinite loop;
+                  ../src/task rc:hang.rc info 1};
   alarm 0;
 
   like ($output, qr/^Description\s+infinite loop\n/m, 'no hang');
diff --git a/test/bug.hasnt.t b/test/bug.hasnt.t
index 06b51c2ba..db464b141 100755
--- a/test/bug.hasnt.t
+++ b/test/bug.hasnt.t
@@ -40,39 +40,39 @@ if (open my $fh, '>', 'hasnt.rc')
 }
 
 # 1
-qx{../task rc:hasnt.rc add foo};
+qx{../src/task rc:hasnt.rc add foo};
 
 # 2
-qx{../task rc:hasnt.rc add foo};
-qx{../task rc:hasnt.rc 2 annotate bar};
+qx{../src/task rc:hasnt.rc add foo};
+qx{../src/task rc:hasnt.rc 2 annotate bar};
 
 # 3
-qx{../task rc:hasnt.rc add foo};
-qx{../task rc:hasnt.rc 3 annotate bar};
+qx{../src/task rc:hasnt.rc add foo};
+qx{../src/task rc:hasnt.rc 3 annotate bar};
 diag ("3 second delay");
 sleep 1;
-qx{../task rc:hasnt.rc 3 annotate baz};
+qx{../src/task rc:hasnt.rc 3 annotate baz};
 
 # 4
-qx{../task rc:hasnt.rc add bar};
+qx{../src/task rc:hasnt.rc add bar};
 
 # 5
-qx{../task rc:hasnt.rc add bar};
-qx{../task rc:hasnt.rc 5 annotate foo};
+qx{../src/task rc:hasnt.rc add bar};
+qx{../src/task rc:hasnt.rc 5 annotate foo};
 
 # 6
-qx{../task rc:hasnt.rc add bar};
-qx{../task rc:hasnt.rc 6 annotate foo};
+qx{../src/task rc:hasnt.rc add bar};
+qx{../src/task rc:hasnt.rc 6 annotate foo};
 sleep 1;
-qx{../task rc:hasnt.rc 6 annotate baz};
+qx{../src/task rc:hasnt.rc 6 annotate baz};
 
 #7
-qx{../task rc:hasnt.rc add one};
-qx{../task rc:hasnt.rc 7 annotate two};
+qx{../src/task rc:hasnt.rc add one};
+qx{../src/task rc:hasnt.rc 7 annotate two};
 sleep 1;
-qx{../task rc:hasnt.rc 7 annotate three};
+qx{../src/task rc:hasnt.rc 7 annotate three};
 
-my $output = qx{../task rc:hasnt.rc ls description.has:foo};
+my $output = qx{../src/task rc:hasnt.rc ls description.has:foo};
 like   ($output, qr/\n 1/, '1 has foo -> yes');
 like   ($output, qr/\n 2/, '2 has foo -> yes');
 like   ($output, qr/\n 3/, '3 has foo -> yes');
@@ -81,7 +81,7 @@ like   ($output, qr/\n 5/, '5 has foo -> yes');
 like   ($output, qr/\n 6/, '6 has foo -> yes');
 unlike ($output, qr/\n 7/, '7 has foo -> no');
 
-$output = qx{../task rc:hasnt.rc ls description.hasnt:foo};
+$output = qx{../src/task rc:hasnt.rc ls description.hasnt:foo};
 unlike ($output, qr/\n 1/, '1 hasnt foo -> no');
 unlike ($output, qr/\n 2/, '2 hasnt foo -> no');
 unlike ($output, qr/\n 3/, '3 hasnt foo -> no');
diff --git a/test/bug.period.t b/test/bug.period.t
index 8e9160632..64e9de45b 100755
--- a/test/bug.period.t
+++ b/test/bug.period.t
@@ -74,65 +74,65 @@ Confirmed:
                      *y
 =cut
 
-my $output = qx{../task rc:period.rc add daily due:tomorrow recur:daily};
+my $output = qx{../src/task rc:period.rc add daily due:tomorrow recur:daily};
 unlike ($output, qr/was not recognized/, 'recur:daily');
 
-$output = qx{../task rc:period.rc add day due:tomorrow recur:day};
+$output = qx{../src/task rc:period.rc add day due:tomorrow recur:day};
 unlike ($output, qr/was not recognized/, 'recur:day');
 
-$output = qx{../task rc:period.rc add weekly due:tomorrow recur:weekly};
+$output = qx{../src/task rc:period.rc add weekly due:tomorrow recur:weekly};
 unlike ($output, qr/was not recognized/, 'recur:weekly');
 
-$output = qx{../task rc:period.rc add sennight due:tomorrow recur:sennight};
+$output = qx{../src/task rc:period.rc add sennight due:tomorrow recur:sennight};
 unlike ($output, qr/was not recognized/, 'recur:sennight');
 
-$output = qx{../task rc:period.rc add biweekly due:tomorrow recur:biweekly};
+$output = qx{../src/task rc:period.rc add biweekly due:tomorrow recur:biweekly};
 unlike ($output, qr/was not recognized/, 'recur:biweekly');
 
-$output = qx{../task rc:period.rc add fortnight due:tomorrow recur:fortnight};
+$output = qx{../src/task rc:period.rc add fortnight due:tomorrow recur:fortnight};
 unlike ($output, qr/was not recognized/, 'recur:fortnight');
 
-$output = qx{../task rc:period.rc add monthly due:tomorrow recur:monthly};
+$output = qx{../src/task rc:period.rc add monthly due:tomorrow recur:monthly};
 unlike ($output, qr/was not recognized/, 'recur:monthly');
 
-$output = qx{../task rc:period.rc add quarterly due:tomorrow recur:quarterly};
+$output = qx{../src/task rc:period.rc add quarterly due:tomorrow recur:quarterly};
 unlike ($output, qr/was not recognized/, 'recur:quarterly');
 
-$output = qx{../task rc:period.rc add semiannual due:tomorrow recur:semiannual};
+$output = qx{../src/task rc:period.rc add semiannual due:tomorrow recur:semiannual};
 unlike ($output, qr/was not recognized/, 'recur:semiannual');
 
-$output = qx{../task rc:period.rc add bimonthly due:tomorrow recur:bimonthly};
+$output = qx{../src/task rc:period.rc add bimonthly due:tomorrow recur:bimonthly};
 unlike ($output, qr/was not recognized/, 'recur:bimonthly');
 
-$output = qx{../task rc:period.rc add biannual due:tomorrow recur:biannual};
+$output = qx{../src/task rc:period.rc add biannual due:tomorrow recur:biannual};
 unlike ($output, qr/was not recognized/, 'recur:biannual');
 
-$output = qx{../task rc:period.rc add biyearly due:tomorrow recur:biyearly};
+$output = qx{../src/task rc:period.rc add biyearly due:tomorrow recur:biyearly};
 unlike ($output, qr/was not recognized/, 'recur:biyearly');
 
-$output = qx{../task rc:period.rc add annual due:tomorrow recur:annual};
+$output = qx{../src/task rc:period.rc add annual due:tomorrow recur:annual};
 unlike ($output, qr/was not recognized/, 'recur:annual');
 
-$output = qx{../task rc:period.rc add yearly due:tomorrow recur:yearly};
+$output = qx{../src/task rc:period.rc add yearly due:tomorrow recur:yearly};
 unlike ($output, qr/was not recognized/, 'recur:yearly');
 
-$output = qx{../task rc:period.rc add 2d due:tomorrow recur:2d};
+$output = qx{../src/task rc:period.rc add 2d due:tomorrow recur:2d};
 unlike ($output, qr/was not recognized/, 'recur:2d');
 
-$output = qx{../task rc:period.rc add 2w due:tomorrow recur:2w};
+$output = qx{../src/task rc:period.rc add 2w due:tomorrow recur:2w};
 unlike ($output, qr/was not recognized/, 'recur:2w');
 
-$output = qx{../task rc:period.rc add 2m due:tomorrow recur:2mo};
+$output = qx{../src/task rc:period.rc add 2m due:tomorrow recur:2mo};
 unlike ($output, qr/was not recognized/, 'recur:2m');
 
-$output = qx{../task rc:period.rc add 2q due:tomorrow recur:2q};
+$output = qx{../src/task rc:period.rc add 2q due:tomorrow recur:2q};
 unlike ($output, qr/was not recognized/, 'recur:2q');
 
-$output = qx{../task rc:period.rc add 2y due:tomorrow recur:2y};
+$output = qx{../src/task rc:period.rc add 2y due:tomorrow recur:2y};
 unlike ($output, qr/was not recognized/, 'recur:2y');
 
 # Verify that the recurring task instances get created.  One of each.
-$output = qx{../task rc:period.rc list};
+$output = qx{../src/task rc:period.rc list};
 like ($output, qr/\bdaily\b/,      'verify daily');
 like ($output, qr/\bday\b/,        'verify day');
 like ($output, qr/\bweekly\b/,     'verify weekly');
diff --git a/test/bug.range.t b/test/bug.range.t
index e72c2933c..a4c5fc80d 100755
--- a/test/bug.range.t
+++ b/test/bug.range.t
@@ -40,10 +40,10 @@ if (open my $fh, '>', 'range.rc')
 }
 
 # Add three tasks, and attempt to list the middle one within a range.
-qx{../task rc:range.rc add one due:8/1/2009};
-qx{../task rc:range.rc add two due:8/3/2009};
-qx{../task rc:range.rc add three due:8/5/2009};
-my $output = qx{../task rc:range.rc ls due.after:8/2/2009 due.before:8/4/2009};
+qx{../src/task rc:range.rc add one due:8/1/2009};
+qx{../src/task rc:range.rc add two due:8/3/2009};
+qx{../src/task rc:range.rc add three due:8/5/2009};
+my $output = qx{../src/task rc:range.rc ls due.after:8/2/2009 due.before:8/4/2009};
 unlike ($output, qr/one/,   'Missing prior to range');
 like   ($output, qr/two/,   'Found within range');
 unlike ($output, qr/three/, 'Missing after range');
diff --git a/test/bug.recur.t b/test/bug.recur.t
index c4abd863b..88e6ec80e 100755
--- a/test/bug.recur.t
+++ b/test/bug.recur.t
@@ -40,8 +40,8 @@ if (open my $fh, '>', 'recur.rc')
 }
 
 # Add a recurring task with no due date, look for expected error.
-qx{../task rc:recur.rc add foo recur:daily};
-my $output = qx{../task rc:recur.rc info 1};
+qx{../src/task rc:recur.rc add foo recur:daily};
+my $output = qx{../src/task rc:recur.rc info 1};
 unlike ($output, qr/Description\s+foo/, 'task not created - missing due date');
 
 # Cleanup.
diff --git a/test/bug.sort.t b/test/bug.sort.t
index 2c1b93f83..790913016 100755
--- a/test/bug.sort.t
+++ b/test/bug.sort.t
@@ -38,16 +38,16 @@ if (open my $fh, '>', 'bug_sort.rc')
   ok (-r 'bug_sort.rc', 'Created bug_sort.rc');
 }
 
-my $setup = "../task rc:bug_sort.rc add one;"
-          . "../task rc:bug_sort.rc add two;"
-          . "../task rc:bug_sort.rc add three recur:daily due:eom;";
+my $setup = "../src/task rc:bug_sort.rc add one;"
+          . "../src/task rc:bug_sort.rc add two;"
+          . "../src/task rc:bug_sort.rc add three recur:daily due:eom;";
 qx{$setup};
 
-my $output = qx{../task rc:bug_sort.rc list};
+my $output = qx{../src/task rc:bug_sort.rc list};
 like ($output, qr/three.*(?:one.*two|two.*one)/msi, 'list did not hang');
 
-qx{../task rc:bug_sort.rc 1 priority:H};
-$output = qx{../task rc:bug_sort.rc list};
+qx{../src/task rc:bug_sort.rc 1 priority:H};
+$output = qx{../src/task rc:bug_sort.rc list};
 like ($output, qr/three.*one.*two/msi, 'list did not hang after pri:H on 1');
 
 # Cleanup.
diff --git a/test/bug.start.extra.t b/test/bug.start.extra.t
index 3e6a0e81c..85371e521 100755
--- a/test/bug.start.extra.t
+++ b/test/bug.start.extra.t
@@ -39,10 +39,10 @@ if (open my $fh, '>', 'extra.rc')
   ok (-r 'extra.rc', 'Created extra.rc');
 }
 
-qx{../task rc:extra.rc add foo};
-my $output = qx{../task rc:extra.rc 1 start pri:L};
+qx{../src/task rc:extra.rc add foo};
+my $output = qx{../src/task rc:extra.rc 1 start pri:L};
 like ($output, qr/The 'start' command does not allow further modification of a task\./, 'no modifications allowed for start');
-$output = qx{../task rc:extra.rc 1 stop pro:bar};
+$output = qx{../src/task rc:extra.rc 1 stop pro:bar};
 like ($output, qr/The 'stop' command does not allow further modification of a task\./, 'no modifications allowed for stop');
 
 # Cleanup.
diff --git a/test/bug.summary.t b/test/bug.summary.t
index 8d1d19fda..df4af9585 100755
--- a/test/bug.summary.t
+++ b/test/bug.summary.t
@@ -41,16 +41,16 @@ if (open my $fh, '>', 'summary.rc')
 
 # Add three tasks.  Do 1, delete 1, leave 1 pending.  Summary should depict a
 # 50% completion.
-qx{../task rc:summary.rc add project:A one};
-qx{../task rc:summary.rc add project:A two};
-qx{../task rc:summary.rc add project:A three};
-qx{../task rc:summary.rc do 1};
-qx{../task rc:summary.rc delete 2};
-my $output = qx{../task rc:summary.rc summary};
+qx{../src/task rc:summary.rc add project:A one};
+qx{../src/task rc:summary.rc add project:A two};
+qx{../src/task rc:summary.rc add project:A three};
+qx{../src/task rc:summary.rc do 1};
+qx{../src/task rc:summary.rc delete 2};
+my $output = qx{../src/task rc:summary.rc summary};
 like ($output, qr/A\s+1\s+(?:-|\d\ssecs?)\s+50%/, 'summary correctly shows 50% before report');
 
-qx{../task rc:summary.rc list};
-$output = qx{../task rc:summary.rc summary};
+qx{../src/task rc:summary.rc list};
+$output = qx{../src/task rc:summary.rc summary};
 like ($output, qr/A\s+1\s+(?:-|\d\ssecs?)\s+50%/, 'summary correctly shows 50% after report');
 
 # Cleanup.
diff --git a/test/bug.uuid.t b/test/bug.uuid.t
index 02c90bb8c..ddd5723d8 100755
--- a/test/bug.uuid.t
+++ b/test/bug.uuid.t
@@ -41,39 +41,39 @@ if (open my $fh, '>', 'uuid.rc')
 
 # Add a task, dup it, add a recurring task, list.  Then make sure they all have
 # unique UUID values.
-qx{../task rc:uuid.rc add simple};
-qx{../task rc:uuid.rc 1 duplicate};
-qx{../task rc:uuid.rc add periodic recur:daily due:yesterday};
-my $output = qx{../task rc:uuid.rc stats};
+qx{../src/task rc:uuid.rc add simple};
+qx{../src/task rc:uuid.rc 1 duplicate};
+qx{../src/task rc:uuid.rc add periodic recur:daily due:yesterday};
+my $output = qx{../src/task rc:uuid.rc stats};
 
 my @all_uuids;
 my %unique_uuids;
-$output = qx{../task rc:uuid.rc 1 info};
+$output = qx{../src/task rc:uuid.rc 1 info};
 my ($uuid) = $output =~ /UUID\s+(\S+)/;
 push @all_uuids, $uuid;
 $unique_uuids{$uuid} = undef;
 
-$output = qx{../task rc:uuid.rc 2 info};
+$output = qx{../src/task rc:uuid.rc 2 info};
 ($uuid) = $output =~ /UUID\s+(\S+)/;
 push @all_uuids, $uuid;
 $unique_uuids{$uuid} = undef;
 
-$output = qx{../task rc:uuid.rc 3 info};
+$output = qx{../src/task rc:uuid.rc 3 info};
 ($uuid) = $output =~ /UUID\s+(\S+)/;
 push @all_uuids, $uuid;
 $unique_uuids{$uuid} = undef;
 
-$output = qx{../task rc:uuid.rc 4 info};
+$output = qx{../src/task rc:uuid.rc 4 info};
 ($uuid) = $output =~ /UUID\s+(\S+)/;
 push @all_uuids, $uuid;
 $unique_uuids{$uuid} = undef;
 
-$output = qx{../task rc:uuid.rc 5 info};
+$output = qx{../src/task rc:uuid.rc 5 info};
 ($uuid) = $output =~ /UUID\s+(\S+)/;
 push @all_uuids, $uuid;
 $unique_uuids{$uuid} = undef;
 
-$output = qx{../task rc:uuid.rc 6 info};
+$output = qx{../src/task rc:uuid.rc 6 info};
 ($uuid) = $output =~ /UUID\s+(\S+)/;
 push @all_uuids, $uuid;
 $unique_uuids{$uuid} = undef;
diff --git a/test/cal.t b/test/cal.t
index a3de455f6..531a02932 100755
--- a/test/cal.t
+++ b/test/cal.t
@@ -64,7 +64,7 @@ if ($day <= 9)
 }
 
 # task cal   and   task cal y
-my $output = qx{../task rc:cal.rc rc._forcecolor:on cal};
+my $output = qx{../src/task rc:cal.rc rc._forcecolor:on cal};
 if ($wday == 6 || $wday == 0)
 {
   like   ($output, qr/\[30;106m$day/,      'Current day is highlighted');
@@ -74,14 +74,14 @@ else
   like   ($output, qr/\[30;46m$day/,      'Current day is highlighted');
 }
 like   ($output, qr/$month\S*?\s+?$year/, 'Current month and year are displayed');
-$output = qx{../task rc:cal.rc add zero};
+$output = qx{../src/task rc:cal.rc add zero};
 unlike ($output, qr/\[41m\d+/,       'No overdue tasks are present');
 unlike ($output, qr/\[43m\d+/,       'No due tasks are present');
-$output = qx{../task rc:cal.rc rc.weekstart:Sunday cal};
+$output = qx{../src/task rc:cal.rc rc.weekstart:Sunday cal};
 like   ($output, qr/Su Mo Tu/,       'Week starts on Sunday');
-$output = qx{../task rc:cal.rc rc.weekstart:Monday cal};
+$output = qx{../src/task rc:cal.rc rc.weekstart:Monday cal};
 like   ($output, qr/Fr Sa Su/,       'Week starts on Monday');
-$output = qx{../task rc:cal.rc cal y};
+$output = qx{../src/task rc:cal.rc cal y};
 like   ($output, qr/$month\S*?\s+?$year/,         'Current month and year are displayed');
 if ($month eq "Jan")
 {
@@ -95,21 +95,21 @@ if ($month eq "Jan")
 unlike ($output, qr/$month\S*?\s+?$nextyear/,     'Current month and year ahead are not displayed');
 
 # task cal due   and   task cal due y
-qx{../task rc:cal.rc add due:20190515 one};
-qx{../task rc:cal.rc add due:20200123 two};
-$output = qx{../task rc:cal.rc rc._forcecolor:on cal due};
+qx{../src/task rc:cal.rc add due:20190515 one};
+qx{../src/task rc:cal.rc add due:20200123 two};
+$output = qx{../src/task rc:cal.rc rc._forcecolor:on cal due};
 unlike ($output, qr/April 2019/,    'April 2019 is not displayed');
 like   ($output, qr/May 2019/,      'May 2019 is displayed');
 unlike ($output, qr/January 2020/,  'January 2020 is not displayed');
 like   ($output, qr/30;42m15/,      'Task 1 is color-coded due');
-$output = qx{../task rc:cal.rc rc._forcecolor:on cal due y};
+$output = qx{../src/task rc:cal.rc rc._forcecolor:on cal due y};
 like   ($output, qr/30;42m23/,      'Task 2 is color-coded due');
 like   ($output, qr/April 2020/,    'April 2020 is displayed');
 unlike ($output, qr/May 2020/,      'May 2020 is not displayed');
-qx{../task rc:cal.rc ls};
-qx{../task rc:cal.rc del 1-3};
-qx{../task rc:cal.rc add due:20080408 three};
-$output = qx{../task rc:cal.rc rc._forcecolor:on cal due};
+qx{../src/task rc:cal.rc ls};
+qx{../src/task rc:cal.rc del 1-3};
+qx{../src/task rc:cal.rc add due:20080408 three};
+$output = qx{../src/task rc:cal.rc rc._forcecolor:on cal due};
 like   ($output, qr/April 2008/,     'April 2008 is displayed');
 like   ($output, qr/41m 8/,          'Task 3 is color-coded overdue');
 like   ($output, qr/37;100m19/,      'Saturday April 19, 2008 is color-coded');
@@ -117,7 +117,7 @@ like   ($output, qr/37;100m20/,      'Sunday April 20, 2008 is color-coded');
 like   ($output, qr/30;47m  1/,      'Weeknumbers are color-coded');
 
 # task cal 2016
-$output = qx{../task rc:cal.rc rc.weekstart:Monday cal 2016};
+$output = qx{../src/task rc:cal.rc rc.weekstart:Monday cal 2016};
 unlike ($output, qr/2015/,           'Year 2015 is not displayed');
 unlike ($output, qr/2017/,           'Year 2017 is not displayed');
 like   ($output, qr/January 2016/,   'January 2016 is displayed');
@@ -126,32 +126,32 @@ like   ($output, qr/53 +1/,          '2015 has 53 weeks (ISO)');
 like   ($output, qr/1 +4/,           'First week in 2016 starts with Mon Jan 4 (ISO)');
 like   ($output, qr/52 +26/,         'Last week in 2016 starts with Mon Dec 26 (ISO)');
 like   ($output, qr/9 +29/,          'Leap year - Feb 29 is Monday in week 9 (ISO)');
-$output = qx{../task rc:cal.rc rc.weekstart:Sunday cal 2016};
+$output = qx{../src/task rc:cal.rc rc.weekstart:Sunday cal 2016};
 like   ($output, qr/1 +1/,           'First week in 2016 starts with Fri Jan 1 (US)');
 like   ($output, qr/53 +25/,         'Last week in 2016 starts with Sun Dec 25 (US)');
-$output = qx{../task rc:cal.rc rc.weekstart:Monday rc.displayweeknumber:off cal 2016};
+$output = qx{../src/task rc:cal.rc rc.weekstart:Monday rc.displayweeknumber:off cal 2016};
 unlike ($output, qr/53/,             'Weeknumbers are not displayed');
 
 # task cal 4 2010
-$output = qx{../task rc:cal.rc rc.monthsperline:1 cal 4 2010};
+$output = qx{../src/task rc:cal.rc rc.monthsperline:1 cal 4 2010};
 unlike ($output, qr/March 2010/,     'March 2010 is not displayed');
 like   ($output, qr/April 2010/,     'April 2010 is displayed');
 unlike ($output, qr/May 2010/,       'May 2010 is not displayed');
 
 # calendar offsets
-$output = qx{../task rc:cal.rc rc.calendar.offset:on rc.monthsperline:1 cal 1 2011};
+$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.monthsperline:1 cal 1 2011};
 unlike ($output, qr/November 2010/,  'November 2010 is not displayed');
 like   ($output, qr/December 2010/,  'December 2010 is displayed');
 unlike ($output, qr/January 2011/,   'January  2011 is not displayed');
-$output = qx{../task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:2 rc.monthsperline:1 cal 1 2011};
+$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:2 rc.monthsperline:1 cal 1 2011};
 unlike ($output, qr/January 2011/,   'January  2011 is not displayed');
 unlike ($output, qr/February 2011/,  'February 2011 is not displayed');
 like   ($output, qr/March 2011/,     'March 2011 is displayed');
 unlike ($output, qr/April 2011/,     'April 2011 is not displayed');
-$output = qx{../task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:-12 rc.monthsperline:1 cal};
+$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:-12 rc.monthsperline:1 cal};
 like   ($output, qr/$month\S*?\s+?$prevyear/, 'Current month and year ahead are displayed');
 unlike ($output, qr/$month\S*?\s+?$year/,     'Current month and year are not displayed');
-$output = qx{../task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:12 rc.monthsperline:1 cal};
+$output = qx{../src/task rc:cal.rc rc.calendar.offset:on rc.calendar.offset.value:12 rc.monthsperline:1 cal};
 unlike ($output, qr/$month\S*?\s+?$year/,     'Current month and year are not displayed');
 like   ($output, qr/$month\S*?\s+?$nextyear/, 'Current month and year ahead are displayed');
 
@@ -189,19 +189,19 @@ if (open my $fh, '>', 'details.rc')
 }
 
 # task calendar details
-qx{../task rc:details.rc add due:20150105 one};
-qx{../task rc:details.rc add due:20150110 two};
-qx{../task rc:details.rc add due:20150210 three};
-qx{../task rc:details.rc add due:20150410 four};
-qx{../task rc:details.rc add due:20151225 five};
-qx{../task rc:details.rc add due:20141231 six};
-qx{../task rc:details.rc add due:20160101 seven};
-qx{../task rc:details.rc add due:20081231 eight};
+qx{../src/task rc:details.rc add due:20150105 one};
+qx{../src/task rc:details.rc add due:20150110 two};
+qx{../src/task rc:details.rc add due:20150210 three};
+qx{../src/task rc:details.rc add due:20150410 four};
+qx{../src/task rc:details.rc add due:20151225 five};
+qx{../src/task rc:details.rc add due:20141231 six};
+qx{../src/task rc:details.rc add due:20160101 seven};
+qx{../src/task rc:details.rc add due:20081231 eight};
 
-$output = qx{../task rc:details.rc rc.calendar.legend:no cal};
+$output = qx{../src/task rc:details.rc rc.calendar.legend:no cal};
 unlike ($output, qr/Legend:/,      'Legend is not displayed');
 
-$output = qx{../task rc:details.rc cal rc.monthsperline:3 1 2015};
+$output = qx{../src/task rc:details.rc cal rc.monthsperline:3 1 2015};
 like   ($output, qr/January 2015/, 'January 2015 is displayed');
 like   ($output, qr/20150105/,     'Due date 20150105 is displayed');
 like   ($output, qr/20150110/,     'Due date 20150110 is displayed');
@@ -210,12 +210,12 @@ unlike ($output, qr/20141231/,     'Due date 20141231 is not displayed');
 unlike ($output, qr/20150410/,     'Due date 20150410 is not displayed');
 like   ($output, qr/3 tasks/,      '3 due tasks are displayed');
 
-$output = qx{../task rc:details.rc cal due};
+$output = qx{../src/task rc:details.rc cal due};
 like   ($output, qr/December 2008/, 'December 2008 is displayed');
 like   ($output, qr/20081231/,      'Due date 20081231 is displayed');
 like   ($output, qr/1 task/,        '1 due task is displayed');
 
-$output = qx{../task rc:details.rc cal 2015};
+$output = qx{../src/task rc:details.rc cal 2015};
 like   ($output, qr/January 2015/,  'January 2015 is displayed');
 like   ($output, qr/December 2015/, 'December 2015 is displayed');
 unlike ($output, qr/20141231/,      'Due date 20141231 is not displayed');
@@ -234,13 +234,13 @@ if ( $mon <= 9)
 }
 my $duedate = $year.$mon.$day;
 
-qx{../task rc:details.rc add due:$duedate rc.monthsperline:1 nine};
-$output = qx{../task rc:details.rc cal};
+qx{../src/task rc:details.rc add due:$duedate rc.monthsperline:1 nine};
+$output = qx{../src/task rc:details.rc cal};
 like   ($output, qr/$month\S*?\s+?$year/, 'Current month and year are displayed');
 like   ($output, qr/$duedate/,            'Due date on current day is displayed');
 like   ($output, qr/1 task/,              '1 due task is displayed');
 
-$output = qx{../task rc:details.rc cal rc.monthsperline:1 1 2015};
+$output = qx{../src/task rc:details.rc cal rc.monthsperline:1 1 2015};
 like   ($output, qr/Date/,         'Word Date is displayed');
 like   ($output, qr/Holiday/,      'Word Holiday is displayed');
 like   ($output, qr/20150101/,     'Holiday 20150101 is displayed');
@@ -250,7 +250,7 @@ like   ($output, qr/AAAA/,         'Holiday name AAAA is displayed');
 like   ($output, qr/BBBBBB/,       'Holiday name BBBBBB is displayed');
 like   ($output, qr/åäö/,          'Holiday name åäö is displayed');
 
-$output = qx{../task rc:details.rc cal rc._forcecolor:on rc.monthsperline:1 rc.calendar.details:sparse rc.calendar.holidays:sparse 1 2015};
+$output = qx{../src/task rc:details.rc cal rc._forcecolor:on rc.monthsperline:1 rc.calendar.details:sparse rc.calendar.holidays:sparse 1 2015};
 unlike ($output, qr/Date/,         'Word Date is not displayed');
 unlike ($output, qr/Holiday/,      'Word Holiday is not displayed');
 like   ($output, qr/30;103m 1/,    'Holiday AAAA is color-coded');
diff --git a/test/caseless.t b/test/caseless.t
index 0d47bb383..405cf47df 100755
--- a/test/caseless.t
+++ b/test/caseless.t
@@ -39,84 +39,84 @@ if (open my $fh, '>', 'caseless.rc')
 }
 
 # Attempt case-sensitive and case-insensitive substitutions and filters.
-qx{../task rc:caseless.rc add one two three};
-qx{../task rc:caseless.rc 1 annotate four five six};
+qx{../src/task rc:caseless.rc add one two three};
+qx{../src/task rc:caseless.rc 1 annotate four five six};
 my $output;
 
 # Description substitution.
 # 2
-qx{../task rc:caseless.rc rc.search.case.sensitive:yes 1 /One/ONE/};
-$output = qx{../task rc:caseless.rc info 1};
+qx{../src/task rc:caseless.rc rc.search.case.sensitive:yes 1 /One/ONE/};
+$output = qx{../src/task rc:caseless.rc info 1};
 unlike ($output, qr/One two three/, 'one two three\nfour five six -> /One/ONE/ = fail');
 
 # 3
-qx{../task rc:caseless.rc rc.search.case.sensitive:no 1 /One/ONE/};
-$output = qx{../task rc:caseless.rc info 1};
+qx{../src/task rc:caseless.rc rc.search.case.sensitive:no 1 /One/ONE/};
+$output = qx{../src/task rc:caseless.rc info 1};
 like ($output, qr/ONE two three/, 'one two three\nfour five six -> /One/ONE/ = caseless succeed');
 
 # 4
-qx{../task rc:caseless.rc rc.search.case.sensitive:yes 1 /one/One/};
-$output = qx{../task rc:caseless.rc info 1};
+qx{../src/task rc:caseless.rc rc.search.case.sensitive:yes 1 /one/One/};
+$output = qx{../src/task rc:caseless.rc info 1};
 unlike ($output, qr/One two three/, 'ONE two three\nfour five six -> /one/ONE/ = fail');
 
 # 5
-qx{../task rc:caseless.rc rc.search.case.sensitive:no 1 /one/one/};
-$output = qx{../task rc:caseless.rc info 1};
+qx{../src/task rc:caseless.rc rc.search.case.sensitive:no 1 /one/one/};
+$output = qx{../src/task rc:caseless.rc info 1};
 like ($output, qr/one two three/, 'ONE two three\nfour five six -> /one/one/ = caseless succeed');
 
 # Annotation substitution.
 # 6
-qx{../task rc:caseless.rc rc.search.case.sensitive:yes 1 /Five/FIVE/};
-$output = qx{../task rc:caseless.rc info 1};
+qx{../src/task rc:caseless.rc rc.search.case.sensitive:yes 1 /Five/FIVE/};
+$output = qx{../src/task rc:caseless.rc info 1};
 unlike ($output, qr/four FIVE six/, 'one two three\nfour five six -> /Five/FIVE/ = fail');
 
 # 7
-qx{../task rc:caseless.rc rc.search.case.sensitive:no 1 /Five/FIVE/};
-$output = qx{../task rc:caseless.rc info 1};
+qx{../src/task rc:caseless.rc rc.search.case.sensitive:no 1 /Five/FIVE/};
+$output = qx{../src/task rc:caseless.rc info 1};
 like ($output, qr/four FIVE six/, 'one two three\nfour five six -> /Five/FIVE/ = caseless succeed');
 
 # 8
-qx{../task rc:caseless.rc rc.search.case.sensitive:yes 1 /five/Five/};
-$output = qx{../task rc:caseless.rc info 1};
+qx{../src/task rc:caseless.rc rc.search.case.sensitive:yes 1 /five/Five/};
+$output = qx{../src/task rc:caseless.rc info 1};
 unlike ($output, qr/four Five six/, 'one two three\nfour FIVE six -> /five/Five/ = fail');
 
 # 9
-qx{../task rc:caseless.rc rc.search.case.sensitive:no 1 /five/five/};
-$output = qx{../task rc:caseless.rc info 1};
+qx{../src/task rc:caseless.rc rc.search.case.sensitive:no 1 /five/five/};
+$output = qx{../src/task rc:caseless.rc info 1};
 like ($output, qr/four five six/, 'one two three\nfour FIVE six -> /five/five/ = caseless succeed');
 
 # Description filter.
 # 10
-$output = qx{../task rc:caseless.rc rc.search.case.sensitive:yes ls One};
+$output = qx{../src/task rc:caseless.rc rc.search.case.sensitive:yes ls One};
 unlike ($output, qr/one two three/, 'one two three\nfour five six -> ls One = fail');
 
 # 11
-$output = qx{../task rc:caseless.rc rc.search.case.sensitive:no ls One};
+$output = qx{../src/task rc:caseless.rc rc.search.case.sensitive:no ls One};
 like ($output, qr/one two three/, 'one two three\nfour five six -> ls One caseless = succeed');
 
 # 12
-$output = qx{../task rc:caseless.rc rc.search.case.sensitive:yes ls Five};
+$output = qx{../src/task rc:caseless.rc rc.search.case.sensitive:yes ls Five};
 unlike ($output, qr/four five six/, 'one two three\nfour five six -> ls Five = fail');
 
 # 13
-$output = qx{../task rc:caseless.rc rc.search.case.sensitive:no ls Five};
+$output = qx{../src/task rc:caseless.rc rc.search.case.sensitive:no ls Five};
 like ($output, qr/four five six/, 'one two three\nfour five six -> ls Five caseless = succeed');
 
 # Annotation filter.
 # 14
-$output = qx{../task rc:caseless.rc rc.search.case.sensitive:yes ls description.contains:Three};
+$output = qx{../src/task rc:caseless.rc rc.search.case.sensitive:yes ls description.contains:Three};
 unlike ($output, qr/one two three/, 'one two three\nfour five six -> ls description.contains:Three = fail');
 
 # 15
-$output = qx{../task rc:caseless.rc rc.search.case.sensitive:no ls description.contains:Three};
+$output = qx{../src/task rc:caseless.rc rc.search.case.sensitive:no ls description.contains:Three};
 like ($output, qr/one two three/, 'one two three\nfour five six -> ls description.contains:Three caseless = succeed');
 
 # 16
-$output = qx{../task rc:caseless.rc rc.search.case.sensitive:yes ls description.contains:Six};
+$output = qx{../src/task rc:caseless.rc rc.search.case.sensitive:yes ls description.contains:Six};
 unlike ($output, qr/four five six/, 'one two three\nfour five six -> ls description.contains:Six = fail');
 
 # 17
-$output = qx{../task rc:caseless.rc rc.search.case.sensitive:no ls description.contains:Six};
+$output = qx{../src/task rc:caseless.rc rc.search.case.sensitive:no ls description.contains:Six};
 like ($output, qr/four five six/, 'one two three\nfour five six -> ls description.contains:Six caseless = succeed');
 
 # Cleanup.
diff --git a/test/color.active.t b/test/color.active.t
index dd365cda7..76fa5ccff 100755
--- a/test/color.active.t
+++ b/test/color.active.t
@@ -41,10 +41,10 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add nothing};
-qx{../task rc:color.rc add red};
-qx{../task rc:color.rc start 2};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add nothing};
+qx{../src/task rc:color.rc add red};
+qx{../src/task rc:color.rc start 2};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ (?!<\033\[\d\dm) .* nothing .* (?!>\033\[0m) /x, 'none');
 like ($output, qr/ \033\[31m        .* red     .* \033\[0m /x, 'color.active');
diff --git a/test/color.blocked.t b/test/color.blocked.t
index 3f0b81340..76c7f0abb 100755
--- a/test/color.blocked.t
+++ b/test/color.blocked.t
@@ -42,10 +42,10 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add red};
-qx{../task rc:color.rc add nothing};
-qx{../task rc:color.rc 1 depends:2};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add red};
+qx{../src/task rc:color.rc add nothing};
+qx{../src/task rc:color.rc 1 depends:2};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ (?!<\033\[\d\dm) .* nothing .* (?!>\033\[0m) /x, 'none');
 like ($output, qr/ \033\[31m        .* red     .* \033\[0m /x, 'color.blocked');
diff --git a/test/color.deprecated.t b/test/color.deprecated.t
index d87824a64..4e8cef006 100755
--- a/test/color.deprecated.t
+++ b/test/color.deprecated.t
@@ -41,7 +41,7 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-my $output = qx{../task rc:color.rc show};
+my $output = qx{../src/task rc:color.rc show};
 like   ($output, qr/that use deprecated underscores/ms,  'Deprecated color detected');
 
 # Cleanup.
diff --git a/test/color.disable.t b/test/color.disable.t
index 7040f74a0..e3ec5fedf 100755
--- a/test/color.disable.t
+++ b/test/color.disable.t
@@ -40,8 +40,8 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add priority:H red};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add priority:H red};
+my $output = qx{../src/task rc:color.rc list};
 
 like   ($output, qr/red/,       'color.disable - found red');
 unlike ($output, qr/\033\[31m/, 'color.disable - no color red');
diff --git a/test/color.due.t b/test/color.due.t
index f383c593a..1fd6c3dd0 100755
--- a/test/color.due.t
+++ b/test/color.due.t
@@ -41,9 +41,9 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add due:12/31/2037 nothing};
-qx{../task rc:color.rc add due:tomorrow red};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add due:12/31/2037 nothing};
+qx{../src/task rc:color.rc add due:tomorrow red};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ (?!<\033\[\d\dm) \d{1,2}\/\d{1,2}\/\d{4} (?!>\033\[0m) .* nothing /x, 'none');
 like ($output, qr/ \033\[31m        .* red .* \033\[0m/x, 'color.due');
diff --git a/test/color.duetoday.t b/test/color.duetoday.t
index fd1dcb149..50f16e7b3 100755
--- a/test/color.duetoday.t
+++ b/test/color.duetoday.t
@@ -41,9 +41,9 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add due:12/31/2037 nothing};
-qx{../task rc:color.rc add due:1hr red};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add due:12/31/2037 nothing};
+qx{../src/task rc:color.rc add due:1hr red};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ (?!<\033\[\d\dm) \d{1,2}\/\d{1,2}\/\d{4} (?!>\033\[0m) .* nothing /x, 'none');
 like ($output, qr/ (?:\033\[31m|\033\[38;5;9m)        .* red .* \033\[0m/x, 'color.due.today');
diff --git a/test/color.keyword.t b/test/color.keyword.t
index d7f1d2261..ff87eed89 100755
--- a/test/color.keyword.t
+++ b/test/color.keyword.t
@@ -46,12 +46,12 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add nothing};
-qx{../task rc:color.rc add red};
-qx{../task rc:color.rc add green};
-qx{../task rc:color.rc add -- annotation};
-qx{../task rc:color.rc 4 annotate yellow};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add nothing};
+qx{../src/task rc:color.rc add red};
+qx{../src/task rc:color.rc add green};
+qx{../src/task rc:color.rc add -- annotation};
+qx{../src/task rc:color.rc 4 annotate yellow};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ (?!<\033\[\d\dm) .* nothing    .* (?!>\033\[0m) /x, 'none');
 like ($output, qr/ \033\[31m        .* red        .* \033\[0m      /x, 'color.keyword.red');
diff --git a/test/color.overdue.t b/test/color.overdue.t
index 3834cdbfa..1f44b6efd 100755
--- a/test/color.overdue.t
+++ b/test/color.overdue.t
@@ -41,9 +41,9 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add due:tomorrow nothing};
-qx{../task rc:color.rc add due:yesterday red};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add due:tomorrow nothing};
+qx{../src/task rc:color.rc add due:yesterday red};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ (?!<\033\[\d\dm) \d{1,2}\/\d{1,2}\/\d{4} (?!>\033\[0m) .* nothing /x, 'none');
 like ($output, qr/ \033\[31m        .* red .* \033\[0m/x, 'color.overdue');
diff --git a/test/color.pri.t b/test/color.pri.t
index 7c3d5bb62..093ab9d9e 100755
--- a/test/color.pri.t
+++ b/test/color.pri.t
@@ -45,11 +45,11 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add priority:H red};
-qx{../task rc:color.rc add priority:M green};
-qx{../task rc:color.rc add priority:L blue};
-qx{../task rc:color.rc add yellow};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add priority:H red};
+qx{../src/task rc:color.rc add priority:M green};
+qx{../src/task rc:color.rc add priority:L blue};
+qx{../src/task rc:color.rc add yellow};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ \033\[31m .* red    .* \033\[0m /x, 'color.pri.H');
 like ($output, qr/ \033\[32m .* green  .* \033\[0m /x, 'color.pri.M');
diff --git a/test/color.project.t b/test/color.project.t
index 10648b2e5..6f2ceadf6 100755
--- a/test/color.project.t
+++ b/test/color.project.t
@@ -43,9 +43,9 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add nothing};
-qx{../task rc:color.rc add project:x red};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add nothing};
+qx{../src/task rc:color.rc add project:x red};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ \033\[32m        .* nothing .* \033\[0m /x, 'color.project.none');
 like ($output, qr/ \033\[31m        .* red     .* \033\[0m /x, 'color.project.red');
diff --git a/test/color.recurring.t b/test/color.recurring.t
index e14e0034f..10b07a049 100755
--- a/test/color.recurring.t
+++ b/test/color.recurring.t
@@ -42,9 +42,9 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add nothing};
-qx{../task rc:color.rc add due:tomorrow recur:1w red};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add nothing};
+qx{../src/task rc:color.rc add due:tomorrow recur:1w red};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ (?!<\033\[\d\dm) .* nothing .* (?!>\033\[0m) /x, 'none');
 like ($output, qr/ \033\[31m        .* red     .* \033\[0m      /x, 'color.recurring');
diff --git a/test/color.tag.t b/test/color.tag.t
index 36ff1c59c..c104c4194 100755
--- a/test/color.tag.t
+++ b/test/color.tag.t
@@ -45,10 +45,10 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add nothing};
-qx{../task rc:color.rc add +red red};
-qx{../task rc:color.rc add +green green};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add nothing};
+qx{../src/task rc:color.rc add +red red};
+qx{../src/task rc:color.rc add +green green};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ \033\[33m        .* nothing .* \033\[0m /x, 'color.tag.none');
 like ($output, qr/ \033\[31m        .* red     .* \033\[0m /x, 'color.tag.red');
diff --git a/test/color.tagged.t b/test/color.tagged.t
index 457ee9fcc..6ba9d6860 100755
--- a/test/color.tagged.t
+++ b/test/color.tagged.t
@@ -45,9 +45,9 @@ if (open my $fh, '>', 'color.rc')
 }
 
 # Test the add command.
-qx{../task rc:color.rc add nothing};
-qx{../task rc:color.rc add +tag red};
-my $output = qx{../task rc:color.rc list};
+qx{../src/task rc:color.rc add nothing};
+qx{../src/task rc:color.rc add +tag red};
+my $output = qx{../src/task rc:color.rc list};
 
 like ($output, qr/ (?!<\033\[\d\dm) .* nothing .* (?!>\033\[0m) /x, 'none');
 like ($output, qr/ \033\[31m        .* red     .* \033\[0m /x, 'color.tagged');
diff --git a/test/completed.t b/test/completed.t
index 6210e445b..e50ad078e 100755
--- a/test/completed.t
+++ b/test/completed.t
@@ -40,13 +40,13 @@ if (open my $fh, '>', 'completed.rc')
 }
 
 # Add two tasks, mark 1 as done, the other as deleted.
-qx{../task rc:completed.rc add one};
-qx{../task rc:completed.rc add two};
-qx{../task rc:completed.rc 1 done};
-qx{../task rc:completed.rc 2 delete};
+qx{../src/task rc:completed.rc add one};
+qx{../src/task rc:completed.rc add two};
+qx{../src/task rc:completed.rc 1 done};
+qx{../src/task rc:completed.rc 2 delete};
 
 # Generate completed report.
-my $output = qx{../task rc:completed.rc completed};
+my $output = qx{../src/task rc:completed.rc completed};
 like ($output, qr/one/, 'one -> completed');
 unlike ($output, qr/two/, 'two -> deleted');
 
diff --git a/test/config.obsolete.t b/test/config.obsolete.t
index 678b9009f..8b27f6bce 100755
--- a/test/config.obsolete.t
+++ b/test/config.obsolete.t
@@ -40,7 +40,7 @@ if (open my $fh, '>', 'obsolete.rc')
 }
 
 # Test the add command.
-my $output = qx{../task rc:obsolete.rc show};
+my $output = qx{../src/task rc:obsolete.rc show};
 
 like ($output, qr/Your .taskrc file contains these unrecognized variables:\n/,
                'unsupported configuration variable');
diff --git a/test/confirmation.t b/test/confirmation.t
index 67edf973a..4aa172497 100755
--- a/test/confirmation.t
+++ b/test/confirmation.t
@@ -47,52 +47,52 @@ if (open my $fh, '>', 'response.txt')
   ok (-r 'response.txt', 'Created response.txt');
 }
 
-qx{../task rc:confirm.rc add foo} for 1..10;
+qx{../src/task rc:confirm.rc add foo} for 1..10;
 
 # Test the various forms of "Yes".
-my $output = qx{echo "Yes" | ../task rc:confirm.rc del 1};
+my $output = qx{echo "Yes" | ../src/task rc:confirm.rc del 1};
 like ($output, qr/Permanently delete task 1 'foo'\? \(y\/n\)/, 'confirmation - Yes works');
 unlike ($output, qr/Task not deleted\./, 'confirmation - Yes works');
 
-$output = qx{echo "ye" | ../task rc:confirm.rc del 2};
+$output = qx{echo "ye" | ../src/task rc:confirm.rc del 2};
 like ($output, qr/Permanently delete task 2 'foo'\? \(y\/n\)/, 'confirmation - ye works');
 unlike ($output, qr/Task not deleted\./, 'confirmation - ye works');
 
-$output = qx{echo "y" | ../task rc:confirm.rc del 3};
+$output = qx{echo "y" | ../src/task rc:confirm.rc del 3};
 like ($output, qr/Permanently delete task 3 'foo'\? \(y\/n\)/, 'confirmation - y works');
 unlike ($output, qr/Task not deleted\./, 'confirmation - y works');
 
-$output = qx{echo "YES" | ../task rc:confirm.rc del 4};
+$output = qx{echo "YES" | ../src/task rc:confirm.rc del 4};
 like ($output, qr/Permanently delete task 4 'foo'\? \(y\/n\)/, 'confirmation - YES works');
 unlike ($output, qr/Task not deleted\./, 'confirmation - YES works');
 
-$output = qx{echo "YE" | ../task rc:confirm.rc del 5};
+$output = qx{echo "YE" | ../src/task rc:confirm.rc del 5};
 like ($output, qr/Permanently delete task 5 'foo'\? \(y\/n\)/, 'confirmation - YE works');
 unlike ($output, qr/Task not deleted\./, 'confirmation - YE works');
 
-$output = qx{echo "Y" | ../task rc:confirm.rc del 6};
+$output = qx{echo "Y" | ../src/task rc:confirm.rc del 6};
 like ($output, qr/Permanently delete task 6 'foo'\? \(y\/n\)/, 'confirmation - Y works');
 unlike ($output, qr/Task not deleted\./, 'confirmation - Y works');
 
 # Test the various forms of "no".
-$output = qx{echo "no" | ../task rc:confirm.rc del 7};
+$output = qx{echo "no" | ../src/task rc:confirm.rc del 7};
 like ($output, qr/Permanently delete task 7 'foo'\? \(y\/n\)/, 'confirmation - no works');
 like ($output, qr/Task not deleted\./, 'confirmation - no works');
 
-$output = qx{echo "n" | ../task rc:confirm.rc del 7};
+$output = qx{echo "n" | ../src/task rc:confirm.rc del 7};
 like ($output, qr/Permanently delete task 7 'foo'\? \(y\/n\)/, 'confirmation - n works');
 like ($output, qr/Task not deleted\./, 'confirmation - n works');
 
-$output = qx{echo "NO" | ../task rc:confirm.rc del 7};
+$output = qx{echo "NO" | ../src/task rc:confirm.rc del 7};
 like ($output, qr/Permanently delete task 7 'foo'\? \(y\/n\)/, 'confirmation - NO works');
 like ($output, qr/Task not deleted\./, 'confirmation - NO works');
 
-$output = qx{echo "N" | ../task rc:confirm.rc del 7};
+$output = qx{echo "N" | ../src/task rc:confirm.rc del 7};
 like ($output, qr/Permanently delete task 7 'foo'\? \(y\/n\)/, 'confirmation - N works');
 like ($output, qr/Task not deleted\./, 'confirmation - N works');
 
 # Test Yes for multiple changes
-$output = qx{echo -e "y\nY\nY\nY\nY" | ../task rc:confirm.rc 7-10 +bar};
+$output = qx{echo -e "y\nY\nY\nY\nY" | ../src/task rc:confirm.rc 7-10 +bar};
 like ($output, qr/Proceed with change\? \(Yes\/no\/All\/quit\)/, 'multiple confirmations - Y works');
 like ($output, qr/Task 7 "foo"/,     'multiple confirmations - Y works');
 like ($output, qr/Task 8 "foo"/,     'multiple confirmations - Y works');
@@ -101,7 +101,7 @@ like ($output, qr/Task 10 "foo"/,    'multiple confirmations - Y works');
 like ($output, qr/Modified 4 tasks/, 'multiple confirmations - Y works');
 
 # Test no for multiple changes
-$output = qx{echo -e "N\nn\nn\nn\nn" | ../task rc:confirm.rc 7-10 -bar};
+$output = qx{echo -e "N\nn\nn\nn\nn" | ../src/task rc:confirm.rc 7-10 -bar};
 like ($output, qr/Proceed with change\? \(Yes\/no\/All\/quit\)/, 'multiple confirmations - n works');
 like ($output, qr/Task 7 "foo"/,     'multiple confirmations - n works');
 like ($output, qr/Task 8 "foo"/,     'multiple confirmations - n works');
@@ -110,21 +110,21 @@ like ($output, qr/Task 10 "foo"/,    'multiple confirmations - n works');
 like ($output, qr/Modified 0 tasks/, 'multiple confirmations - n works');
 
 # Test All for multiple changes
-$output = qx{echo -e "a\nA" | ../task rc:confirm.rc 7-10 -bar};
+$output = qx{echo -e "a\nA" | ../src/task rc:confirm.rc 7-10 -bar};
 like ($output, qr/Proceed with change\? \(Yes\/no\/All\/quit\)/, 'multiple confirmations - A works');
 like ($output,   qr/Task 7 "foo"/,     'multiple confirmations - A works');
 unlike ($output, qr/Task 8 "foo"/,     'multiple confirmations - A works');
 like ($output,   qr/Modified 4 tasks/, 'multiple confirmations - A works');
 
 # Test quit for multiple changes
-$output = qx{echo "q" | ../task rc:confirm.rc 7-10 +bar};
+$output = qx{echo "q" | ../src/task rc:confirm.rc 7-10 +bar};
 like ($output, qr/Proceed with change\? \(Yes\/no\/All\/quit\)/, 'multiple confirmations - q works');
 like ($output,   qr/Task 7 "foo"/,     'multiple confirmations - q works');
 unlike ($output, qr/Task 8 "foo"/,     'multiple confirmations - q works');
 like ($output,   qr/Modified 0 tasks/, 'multiple confirmations - q works');
 
 # Test newlines.
-$output = qx{cat response.txt | ../task rc:confirm.rc del 7};
+$output = qx{cat response.txt | ../src/task rc:confirm.rc del 7};
 like ($output, qr/(Permanently delete task 7 'foo'\? \(y\/n\)) \1 \1/, 'confirmation - \n re-prompt works');
 
 # Cleanup.
diff --git a/test/count.t b/test/count.t
index c98a7a14c..089f29cd9 100755
--- a/test/count.t
+++ b/test/count.t
@@ -40,26 +40,26 @@ if (open my $fh, '>', 'count.rc')
 }
 
 # Test the count command.
-qx{../task rc:count.rc add one};
-qx{../task rc:count.rc log two};
-qx{../task rc:count.rc add three};
-qx{../task rc:count.rc delete 3};
-qx{../task rc:count.rc add four wait:eom};
-qx{../task rc:count.rc add five due:eom recur:monthly};
+qx{../src/task rc:count.rc add one};
+qx{../src/task rc:count.rc log two};
+qx{../src/task rc:count.rc add three};
+qx{../src/task rc:count.rc delete 3};
+qx{../src/task rc:count.rc add four wait:eom};
+qx{../src/task rc:count.rc add five due:eom recur:monthly};
 
-my $output = qx{../task rc:count.rc count};
+my $output = qx{../src/task rc:count.rc count};
 like ($output, qr/^5$/ms, 'count');
 
-$output = qx{../task rc:count.rc count status:deleted};
+$output = qx{../src/task rc:count.rc count status:deleted};
 like ($output, qr/^1$/ms, 'count status:deleted');
 
-$output = qx{../task rc:count.rc count e};
+$output = qx{../src/task rc:count.rc count e};
 like ($output, qr/^3$/ms, 'count e');
 
-$output = qx{../task rc:count.rc count description.startswith:f};
+$output = qx{../src/task rc:count.rc count description.startswith:f};
 like ($output, qr/^2$/ms, 'count description.startswith:f');
 
-$output = qx{../task rc:count.rc count due.any:};
+$output = qx{../src/task rc:count.rc count due.any:};
 like ($output, qr/^1$/ms, 'count due.any:');
 
 # Cleanup.
diff --git a/test/countdown.t b/test/countdown.t
index a98d79600..f28e684bc 100755
--- a/test/countdown.t
+++ b/test/countdown.t
@@ -64,29 +64,29 @@ if (open my $fh, '>', 'countdown.rc')
 
 # Create a variety of pending tasks with increasingly higher due dates
 # to ensure proper sort order.
-qx{../task rc:countdown.rc add one       due:-1.2y};
-qx{../task rc:countdown.rc add two       due:-9mo};
-qx{../task rc:countdown.rc add three     due:-2mo};
-qx{../task rc:countdown.rc add four      due:-3wk};
-qx{../task rc:countdown.rc add five      due:-7d};
-qx{../task rc:countdown.rc add six       due:-2d};
-qx{../task rc:countdown.rc add seven     due:-1d};
-qx{../task rc:countdown.rc add eight     due:-12h};
-qx{../task rc:countdown.rc add nine      due:-6h};
-qx{../task rc:countdown.rc add ten       due:-1h};
-qx{../task rc:countdown.rc add eleven    due:-30s};
-qx{../task rc:countdown.rc add twelve    due:1h};
-qx{../task rc:countdown.rc add thirteen  due:6h};
-qx{../task rc:countdown.rc add fourteen  due:12h};
-qx{../task rc:countdown.rc add fifteen   due:1d};
-qx{../task rc:countdown.rc add sixteen   due:2d};
-qx{../task rc:countdown.rc add seventeen due:7d};
-qx{../task rc:countdown.rc add eighteen  due:3wk};
-qx{../task rc:countdown.rc add nineteen  due:2mo};
-qx{../task rc:countdown.rc add twenty    due:9mo};
-qx{../task rc:countdown.rc add twentyone due:1.2y};
+qx{../src/task rc:countdown.rc add one       due:-1.2y};
+qx{../src/task rc:countdown.rc add two       due:-9mo};
+qx{../src/task rc:countdown.rc add three     due:-2mo};
+qx{../src/task rc:countdown.rc add four      due:-3wk};
+qx{../src/task rc:countdown.rc add five      due:-7d};
+qx{../src/task rc:countdown.rc add six       due:-2d};
+qx{../src/task rc:countdown.rc add seven     due:-1d};
+qx{../src/task rc:countdown.rc add eight     due:-12h};
+qx{../src/task rc:countdown.rc add nine      due:-6h};
+qx{../src/task rc:countdown.rc add ten       due:-1h};
+qx{../src/task rc:countdown.rc add eleven    due:-30s};
+qx{../src/task rc:countdown.rc add twelve    due:1h};
+qx{../src/task rc:countdown.rc add thirteen  due:6h};
+qx{../src/task rc:countdown.rc add fourteen  due:12h};
+qx{../src/task rc:countdown.rc add fifteen   due:1d};
+qx{../src/task rc:countdown.rc add sixteen   due:2d};
+qx{../src/task rc:countdown.rc add seventeen due:7d};
+qx{../src/task rc:countdown.rc add eighteen  due:3wk};
+qx{../src/task rc:countdown.rc add nineteen  due:2mo};
+qx{../src/task rc:countdown.rc add twenty    due:9mo};
+qx{../src/task rc:countdown.rc add twentyone due:1.2y};
 
-my $output = qx{../task rc:countdown.rc up};
+my $output = qx{../src/task rc:countdown.rc up};
 like ($output, qr/\bone\b.+\btwo\b/ms,          'up: one < two');
 like ($output, qr/\btwo\b.+\bthree/ms,          'up: two < three');
 like ($output, qr/\bthree\b.+\bfour/ms,         'up: three < four');
@@ -108,7 +108,7 @@ like ($output, qr/\beighteen\b.+\bnineteen/ms,  'up: eighteen < nineteen');
 like ($output, qr/\bnineteen\b.+\btwenty/ms,    'up: nineteen < twenty');
 like ($output, qr/\btwenty\b.+\btwentyone/ms,   'up: twenty < twentyone');
 
-$output = qx{../task rc:countdown.rc down};
+$output = qx{../src/task rc:countdown.rc down};
 like ($output, qr/\btwentyone\b.+\btwenty/ms,   'down: twentyone < twenty');
 like ($output, qr/\btwenty\b.+\bnineteen/ms,    'down: twenty < nineteen');
 like ($output, qr/\bnineteen\b.+\beighteen/ms,  'down: nineteen < eighteen');
@@ -130,7 +130,7 @@ like ($output, qr/\bfour\b.+\bthree/ms,         'down: four < three');
 like ($output, qr/\bthree\b.+\btwo/ms,          'down: three < two');
 like ($output, qr/\btwo\b.+\bone\b/ms,          'down: two < one');
 
-$output = qx{../task rc:countdown.rc upc};
+$output = qx{../src/task rc:countdown.rc upc};
 like ($output, qr/\bone\b.+\btwo\b/ms,          'upc: one < two');
 like ($output, qr/\btwo\b.+\bthree/ms,          'upc: two < three');
 like ($output, qr/\bthree\b.+\bfour/ms,         'upc: three < four');
@@ -152,7 +152,7 @@ like ($output, qr/\beighteen\b.+\bnineteen/ms,  'upc: eighteen < nineteen');
 like ($output, qr/\bnineteen\b.+\btwenty/ms,    'upc: nineteen < twenty');
 like ($output, qr/\btwenty\b.+\btwentyone/ms,   'upc: twenty < twentyone');
 
-$output = qx{../task rc:countdown.rc downc};
+$output = qx{../src/task rc:countdown.rc downc};
 like ($output, qr/\btwentyone\b.+\btwenty/ms,   'downc: twentyone < twenty');
 like ($output, qr/\btwenty\b.+\bnineteen/ms,    'downc: twenty < nineteen');
 like ($output, qr/\bnineteen\b.+\beighteen/ms,  'downc: nineteen < eighteen');
diff --git a/test/custom.columns.t b/test/custom.columns.t
index ef794668b..ae3b1e6a2 100755
--- a/test/custom.columns.t
+++ b/test/custom.columns.t
@@ -43,7 +43,7 @@ if (open my $fh, '>', 'custom.rc')
 }
 
 # Generate the usage screen, and locate the custom report on it.
-my $output = qx{../task rc:custom.rc foo 2>&1};
+my $output = qx{../src/task rc:custom.rc foo 2>&1};
 like ($output, qr/Unrecognized column name: foo\.\n/, 'custom report spotted invalid column');
 
 # Cleanup.
diff --git a/test/custom.priority_long.t b/test/custom.priority_long.t
index 4aad051ff..da6500ad5 100755
--- a/test/custom.priority_long.t
+++ b/test/custom.priority_long.t
@@ -43,12 +43,12 @@ if (open my $fh, '>', 'pri.rc')
 }
 
 # Generate the usage screen, and locate the custom report on it.
-qx{../task rc:pri.rc add one   pri:H};
-qx{../task rc:pri.rc add two   pri:M};
-qx{../task rc:pri.rc add three pri:L};
-qx{../task rc:pri.rc add four  pri:};
+qx{../src/task rc:pri.rc add one   pri:H};
+qx{../src/task rc:pri.rc add two   pri:M};
+qx{../src/task rc:pri.rc add three pri:L};
+qx{../src/task rc:pri.rc add four  pri:};
 
-my $output = qx{../task rc:pri.rc foo 2>&1};
+my $output = qx{../src/task rc:pri.rc foo 2>&1};
 like ($output,   qr/ID P/,       'priority_long indicator heading');
 like ($output,   qr/1\s+High/,   'priority_long High');
 like ($output,   qr/2\s+Medium/, 'priority_long Medium');
diff --git a/test/custom.recur_ind.t b/test/custom.recur_ind.t
index 94184af6a..d39e0a60a 100755
--- a/test/custom.recur_ind.t
+++ b/test/custom.recur_ind.t
@@ -43,14 +43,14 @@ if (open my $fh, '>', 'custom.rc')
 }
 
 # Add a recurring and non-recurring task, look for the indicator.
-qx{../task rc:custom.rc add foo due:tomorrow recur:weekly};
-qx{../task rc:custom.rc add bar};
-my $output = qx{../task rc:custom.rc foo 2>&1};
+qx{../src/task rc:custom.rc add foo due:tomorrow recur:weekly};
+qx{../src/task rc:custom.rc add bar};
+my $output = qx{../src/task rc:custom.rc foo 2>&1};
 like ($output,   qr/ID R/,   'Recurrence indicator heading');
 like ($output,   qr/2\s+R/, 'Recurrence indicator t1');
 unlike ($output, qr/1\s+R/, 'No recurrence indicator t2');
 
-$output = qx{../task rc:custom.rc foo rc.recurrence.indicator=RE 2>&1};
+$output = qx{../src/task rc:custom.rc foo rc.recurrence.indicator=RE 2>&1};
 like ($output,   qr/2\s+RE/, 'Custom recurrence indicator t1');
 unlike ($output, qr/1\s+RE/, 'No custom recurrence indicator t2');
 
diff --git a/test/custom.t b/test/custom.t
index 2d94d164c..e5e1acc75 100755
--- a/test/custom.t
+++ b/test/custom.t
@@ -43,12 +43,12 @@ if (open my $fh, '>', 'custom.rc')
 }
 
 # Generate the usage screen, and locate the custom report on it.
-my $output = qx{../task rc:custom.rc usage};
+my $output = qx{../src/task rc:custom.rc usage};
 like ($output, qr/task foo \[tags\] \[attrs\] desc\.\.\.\s+DESC\n/m, 'report.foo');
 
-qx{../task rc:custom.rc add project:A one};
-qx{../task rc:custom.rc add two};
-$output = qx{../task rc:custom.rc foo};
+qx{../src/task rc:custom.rc add project:A one};
+qx{../src/task rc:custom.rc add two};
+$output = qx{../src/task rc:custom.rc foo};
 like ($output, qr/one/, 'custom filter included');
 unlike ($output, qr/two/, 'custom filter excluded');
 
diff --git a/test/custom.tag_ind.t b/test/custom.tag_ind.t
index ce82013e7..9002225f4 100755
--- a/test/custom.tag_ind.t
+++ b/test/custom.tag_ind.t
@@ -43,14 +43,14 @@ if (open my $fh, '>', 'custom.rc')
 }
 
 # Generate the usage screen, and locate the custom report on it.
-qx{../task rc:custom.rc add foo +tag};
-qx{../task rc:custom.rc add bar};
-my $output = qx{../task rc:custom.rc foo 2>&1};
+qx{../src/task rc:custom.rc add foo +tag};
+qx{../src/task rc:custom.rc add bar};
+my $output = qx{../src/task rc:custom.rc foo 2>&1};
 like ($output,   qr/ID T/,   'Tag indicator heading');
 like ($output,   qr/1\s+\+/, 'Tag indicator t1');
 unlike ($output, qr/2\s+\+/, 'No tag indicator t2');
 
-$output = qx{../task rc:custom.rc foo rc.tag.indicator=TAG 2>&1};
+$output = qx{../src/task rc:custom.rc foo rc.tag.indicator=TAG 2>&1};
 like ($output,   qr/1\s+TAG/, 'Custom ag indicator t1');
 unlike ($output, qr/2\s+TAG/, 'No custom tag indicator t2');
 
diff --git a/test/dateformat.t b/test/dateformat.t
index 9cf538fe6..984cb0ca2 100755
--- a/test/dateformat.t
+++ b/test/dateformat.t
@@ -60,24 +60,24 @@ if (open my $fh, '>', 'date3.rc')
   ok (-r 'date3.rc', 'Created date3.rc');
 }
 
-qx{../task rc:date1.rc add foo due:20091231};
-my $output = qx{../task rc:date1.rc info 1};
+qx{../src/task rc:date1.rc add foo due:20091231};
+my $output = qx{../src/task rc:date1.rc info 1};
 like ($output, qr/\b20091231\b/, 'date format YMD parsed');
 
 unlink 'pending.data';
 ok (!-r 'pending.data', 'Removed pending.data');
 
-qx{../task rc:date2.rc add foo due:12/1/09};
-$output = qx{../task rc:date2.rc info 1};
+qx{../src/task rc:date2.rc add foo due:12/1/09};
+$output = qx{../src/task rc:date2.rc info 1};
 like ($output, qr/\b12\/1\/09\b/, 'date format m/d/y parsed');
 
 unlink 'pending.data';
 ok (!-r 'pending.data', 'Removed pending.data');
 
-qx{../task rc:date3.rc add foo due:4/8/10};
-$output = qx{../task rc:date3.rc list};
+qx{../src/task rc:date3.rc add foo due:4/8/10};
+$output = qx{../src/task rc:date3.rc list};
 like ($output, qr/Thursday 08 April 2010 \(v14\)/, 'date format A D B Y (vV) parsed');
-$output = qx{../task rc:date3.rc rc.dateformat.report:"D b Y - a" list};
+$output = qx{../src/task rc:date3.rc rc.dateformat.report:"D b Y - a" list};
 like ($output, qr/08 Apr 2010 - Thu/, 'date format D b Y - a parsed');
                   
 # Cleanup.
diff --git a/test/datesort.t b/test/datesort.t
index 8c8b2683a..6efd3610e 100755
--- a/test/datesort.t
+++ b/test/datesort.t
@@ -46,14 +46,14 @@ if (open my $fh, '>', 'datesort.rc')
   ok (-r 'datesort.rc', 'Created datesort.rc');
 }
 
-qx{../task rc:datesort.rc add two   due:20100201};
-qx{../task rc:datesort.rc add one   due:20100101};
-qx{../task rc:datesort.rc add three due:20100301};
+qx{../src/task rc:datesort.rc add two   due:20100201};
+qx{../src/task rc:datesort.rc add one   due:20100101};
+qx{../src/task rc:datesort.rc add three due:20100301};
 
-my $output = qx{../task rc:datesort.rc small_list};
+my $output = qx{../src/task rc:datesort.rc small_list};
 like ($output, qr/one.+two.+three/ms, 'Sorting by due+ with format MD works');
 
-$output = qx{../task rc:datesort.rc rc.report.small_list.sort=due- small_list};
+$output = qx{../src/task rc:datesort.rc rc.report.small_list.sort=due- small_list};
 like ($output, qr/three.+two.+one/ms, 'Sorting by due- with format MD works');
 
 # Cleanup.
diff --git a/test/default.t b/test/default.t
index b6c09785e..70923e249 100755
--- a/test/default.t
+++ b/test/default.t
@@ -43,38 +43,38 @@ if (open my $fh, '>', 'default.rc')
 }
 
 # Set up a default command, project and priority.
-qx{../task rc:default.rc add all defaults};
-my $output = qx{../task rc:default.rc list};
+qx{../src/task rc:default.rc add all defaults};
+my $output = qx{../src/task rc:default.rc list};
 like ($output, qr/ all defaults/, 'task added');
 like ($output, qr/ PROJECT /,     'default project added');
 like ($output, qr/ M /,           'default priority added');
 like ($output, qr/\//,            'default due added');
 unlink 'pending.data';
 
-qx{../task rc:default.rc add project:specific priority:L due:eoy all specified};
-$output = qx{../task rc:default.rc list};
+qx{../src/task rc:default.rc add project:specific priority:L due:eoy all specified};
+$output = qx{../src/task rc:default.rc list};
 like ($output, qr/ all specified/, 'task added');
 like ($output, qr/ specific /,     'project specified');
 like ($output, qr/ L /,            'priority specified');
 like ($output, qr/\//,             'due specified');
 unlink 'pending.data';
 
-qx{../task rc:default.rc add project:specific project specified};
-$output = qx{../task rc:default.rc list};
+qx{../src/task rc:default.rc add project:specific project specified};
+$output = qx{../src/task rc:default.rc list};
 like ($output, qr/ project specified/, 'task added');
 like ($output, qr/ specific /,         'project specified');
 like ($output, qr/ M /,                'default priority added');
 like ($output, qr/\//,                 'default due added');
 unlink 'pending.data';
 
-qx{../task rc:default.rc add priority:L priority specified};
-$output = qx{../task rc:default.rc list};
+qx{../src/task rc:default.rc add priority:L priority specified};
+$output = qx{../src/task rc:default.rc list};
 like ($output, qr/ priority specified/, 'task added');
 like ($output, qr/ PROJECT /,           'default project added');
 like ($output, qr/ L /,                 'priority specified');
 like ($output, qr/\//,                  'default due added');
 
-$output = qx{../task rc:default.rc};
+$output = qx{../src/task rc:default.rc};
 like ($output, qr/1 PROJECT L .+ priority specified/, 'default command worked');
 
 # Cleanup.
diff --git a/test/delete.t b/test/delete.t
index ddd46f2d3..366d5ca74 100755
--- a/test/delete.t
+++ b/test/delete.t
@@ -41,23 +41,23 @@ if (open my $fh, '>', 'delete.rc')
 }
 
 # Add a task, delete it, undelete it.
-my $output = qx{../task rc:delete.rc add one; ../task rc:delete.rc info 1};
+my $output = qx{../src/task rc:delete.rc add one; ../src/task rc:delete.rc info 1};
 ok (-r 'pending.data', 'pending.data created');
 like ($output, qr/Status\s+Pending\n/, 'Pending');
 
-$output = qx{../task rc:delete.rc delete 1; ../task rc:delete.rc info 1};
+$output = qx{../src/task rc:delete.rc delete 1; ../src/task rc:delete.rc info 1};
 like ($output, qr/Status\s+Deleted\n/, 'Deleted');
 ok (-r 'completed.data', 'completed.data created');
 
-$output = qx{echo 'y' | ../task rc:delete.rc undo; ../task rc:delete.rc info 1};
+$output = qx{echo 'y' | ../src/task rc:delete.rc undo; ../src/task rc:delete.rc info 1};
 like ($output, qr/Status\s+Pending\n/, 'Pending');
 ok (-r 'completed.data', 'completed.data created');
 
-$output = qx{../task rc:delete.rc delete 1; ../task rc:delete.rc list};
+$output = qx{../src/task rc:delete.rc delete 1; ../src/task rc:delete.rc list};
 like ($output, qr/No matches./, 'No matches');
 ok (-r 'completed.data', 'completed.data created');
 
-$output = qx{../task rc:delete.rc info 1};
+$output = qx{../src/task rc:delete.rc info 1};
 like ($output, qr/Task 1 not found/, 'No matches');
 
 # Cleanup.
diff --git a/test/denotate.t b/test/denotate.t
index 8c18473bf..1cf31b7e8 100755
--- a/test/denotate.t
+++ b/test/denotate.t
@@ -45,23 +45,23 @@ if (open my $fh, '>', 'denotate.rc')
 }
 
 # Add four tasks, annotate one three times, one twice, one just once and one none.
-qx{../task rc:denotate.rc add one};
-qx{../task rc:denotate.rc annotate 1 Ernie};
+qx{../src/task rc:denotate.rc add one};
+qx{../src/task rc:denotate.rc annotate 1 Ernie};
 diag ("6 second delay");
 sleep 1;
-qx{../task rc:denotate.rc annotate 1 Bert};
+qx{../src/task rc:denotate.rc annotate 1 Bert};
 sleep 1;
-qx{../task rc:denotate.rc annotate 1 Bibo};
+qx{../src/task rc:denotate.rc annotate 1 Bibo};
 sleep 1;
-qx{../task rc:denotate.rc annotate 1 Kermit the frog};
+qx{../src/task rc:denotate.rc annotate 1 Kermit the frog};
 sleep 1;
-qx{../task rc:denotate.rc annotate 1 Kermit the frog};
+qx{../src/task rc:denotate.rc annotate 1 Kermit the frog};
 sleep 1;
-qx{../task rc:denotate.rc annotate 1 Kermit};
+qx{../src/task rc:denotate.rc annotate 1 Kermit};
 sleep 1;
-qx{../task rc:denotate.rc annotate 1 Kermit and Miss Piggy};
+qx{../src/task rc:denotate.rc annotate 1 Kermit and Miss Piggy};
 
-my $output = qx{../task rc:denotate.rc rrr};
+my $output = qx{../src/task rc:denotate.rc rrr};
 
 like ($output, qr/1 one/,   'task 1');
 like ($output, qr/one.+\d{1,2}\/\d{1,2}\/\d{4} Ernie/ms,                    'first   annotation');
@@ -73,36 +73,36 @@ like ($output, qr/frog.+\d{1,2}\/\d{1,2}\/\d{4} Kermit/ms,                  'six
 like ($output, qr/Kermit.+\d{1,2}\/\d{1,2}\/\d{4} Kermit and Miss Piggy/ms, 'seventh annotation');
 like ($output, qr/1 task/, 'count');
 
-qx{../task rc:denotate.rc denotate 1 Ernie};
-$output = qx{../task rc:denotate.rc rrr};
+qx{../src/task rc:denotate.rc denotate 1 Ernie};
+$output = qx{../src/task rc:denotate.rc rrr};
 unlike ($output, qr/one.+\d{1,2}\/\d{1,2}\/\d{4} Ernie/ms, 'Delete annotation');
 like ($output, qr/one.+\d{1,2}\/\d{1,2}\/\d{4} Bert/ms, 'Bert now first annotationt');
 
-qx{../task rc:denotate.rc denotate 1 Bi};
-$output = qx{../task rc:denotate.rc rrr};
+qx{../src/task rc:denotate.rc denotate 1 Bi};
+$output = qx{../src/task rc:denotate.rc rrr};
 unlike ($output, qr/Bert.+\d{1,2}\/\d{1,2}\/\d{4} Bibo/ms, 'Delete partial match');
 like ($output, qr/Bert.+\d{1,2}\/\d{1,2}\/\d{4} Kermit the frog/ms, 'Kermit the frog now second annotation');
 
-qx{../task rc:denotate.rc denotate 1 BErt};
-$output = qx{../task rc:denotate.rc rrr};
+qx{../src/task rc:denotate.rc denotate 1 BErt};
+$output = qx{../src/task rc:denotate.rc rrr};
 like ($output, qr/one.+\d{1,2}\/\d{1,2}\/\d{4} Bert/ms, 'Denotate is case sensitive');
 like ($output, qr/Bert.+\d{1,2}\/\d{1,2}\/\d{4} Kermit the frog/ms, 'Kermit the frog still second annoation');
 
-qx{../task rc:denotate.rc denotate 1 Kermit};
-$output = qx{../task rc:denotate.rc rrr};
+qx{../src/task rc:denotate.rc denotate 1 Kermit};
+$output = qx{../src/task rc:denotate.rc rrr};
 like ($output, qr/one.+\d{1,2}\/\d{1,2}\/\d{4} Bert/ms,                   'Exact match deletion - Bert');
 like ($output, qr/Bert.+\d{1,2}\/\d{1,2}\/\d{4} Kermit the frog/ms,       'Exact match deletion - Kermit the frog');
 like ($output, qr/frog.+\d{1,2}\/\d{1,2}\/\d{4} Kermit the frog/ms,       'Exact match deletion - Kermit the frog');
 like ($output, qr/frog.+\d{1,2}\/\d{1,2}\/\d{4} Kermit and Miss Piggy/ms, 'Exact match deletion - Kermit and Miss Piggy');
 
-qx{../task rc:denotate.rc denotate 1 Kermit the};
-$output = qx{../task rc:denotate.rc rrr};
+qx{../src/task rc:denotate.rc denotate 1 Kermit the};
+$output = qx{../src/task rc:denotate.rc rrr};
 like ($output, qr/one.+\d{1,2}\/\d{1,2}\/\d{4} Bert/ms,                   'Delete just one annotation - Bert');
 like ($output, qr/Bert.+\d{1,2}\/\d{1,2}\/\d{4} Kermit the frog/ms,       'Delete just one annotation - Kermit the frog');
 like ($output, qr/frog.+\d{1,2}\/\d{1,2}\/\d{4} Kermit and Miss Piggy/ms, 'Delete just one annotation - Kermit and Miss Piggy');
 
-qx{../task rc:denotate.rc denotate 1 Kermit a};
-$output = qx{../task rc:denotate.rc rrr};
+qx{../src/task rc:denotate.rc denotate 1 Kermit a};
+$output = qx{../src/task rc:denotate.rc rrr};
 like ($output, qr/one.+\d{1,2}\/\d{1,2}\/\d{4} Bert/ms,                   'Delete partial match - Bert');
 like ($output, qr/Bert.+\d{1,2}\/\d{1,2}\/\d{4} Kermit the frog/ms,       'Delete partial match - Kermit the frog');
 unlike ($output, qr/frog.+\d{1,2}\/\d{1,2}\/\d{4} Kermit and Miss Piggy/ms, 'Delete partial match - Kermit and Miss Piggy');
diff --git a/test/dependencies.t b/test/dependencies.t
index 6e90bf538..46c343ad4 100755
--- a/test/dependencies.t
+++ b/test/dependencies.t
@@ -45,50 +45,50 @@ if (open my $fh, '>', 'dep.rc')
   ok (-r 'dep.rc', 'Created dep.rc');
 }
 
-qx{../task rc:dep.rc add One};
-qx{../task rc:dep.rc add Two};
+qx{../src/task rc:dep.rc add One};
+qx{../src/task rc:dep.rc add Two};
 
 # [2]
-my $output = qx{../task rc:dep.rc 1 dep:-2};
+my $output = qx{../src/task rc:dep.rc 1 dep:-2};
 like ($output, qr/Modified 0 tasks\./, 'dependencies - remove nonexistent dependency');
 
 # [3]
-$output = qx{../task rc:dep.rc 1 dep:99};
+$output = qx{../src/task rc:dep.rc 1 dep:99};
 like ($output, qr/Could not create a dependency on task 99 - not found\./, 'dependencies - add dependency for nonexistent task');
 
 # [4]
-$output = qx{../task rc:dep.rc 99 dep:1};
+$output = qx{../src/task rc:dep.rc 99 dep:1};
 like ($output, qr/Task 99 not found\./, 'dependencies - add dependency to nonexistent task');
 
 # [5,6] t 1 dep:2; t info 1 => blocked by 2
-$output = qx{../task rc:dep.rc 1 dep:2; ../task rc:dep.rc info 1};
+$output = qx{../src/task rc:dep.rc 1 dep:2; ../src/task rc:dep.rc info 1};
 like ($output, qr/This task blocked by\s+2 Two\nUUID/, 'dependencies - trivial blocked');
 unlike ($output, qr/This task is blocking\n/,          'dependencies - trivial blocked');
 
 # [7,8] t info 2 => blocking 1
-$output = qx{../task rc:dep.rc info 2};
+$output = qx{../src/task rc:dep.rc info 2};
 unlike ($output, qr/This task blocked by/,              'dependencies - trivial blocking');
 like ($output, qr/This task is blocking\s+1 One\nUUID/, 'dependencies - trivial blocking');
 
 # [9] t 1 dep:2 (again)
-$output = qx{../task rc:dep.rc 1 dep:2};
+$output = qx{../src/task rc:dep.rc 1 dep:2};
 like ($output, qr/Task 1 already depends on task 2\./, 'dependencies - add already existing dependency');
 
 # [10,11] t 1 dep:1 => error
-$output = qx{../task rc:dep.rc 1 dep:1};
+$output = qx{../src/task rc:dep.rc 1 dep:1};
 like   ($output, qr/A task cannot be dependent on itself\./, 'dependencies - cannot depend on self');
 unlike ($output, qr/Modified 1 task\./,                      'dependencies - cannot depend on self');
 
 # [12,13] t 1 dep:2; t 2 dep:1 => error
-$output = qx{../task rc:dep.rc 2 dep:1};
+$output = qx{../src/task rc:dep.rc 2 dep:1};
 like   ($output, qr/Circular dependency detected and disallowed\./, 'dependencies - trivial circular');
 unlike ($output, qr/Modified 1 task\./,                             'dependencies - trivial circular');
 
 # [14,15] t 1 dep:2; t 2 dep:3; t 1 dep:3 => not circular
-qx{../task rc:dep.rc 1 dep:2};
-qx{../task rc:dep.rc add Three};
-qx{../task rc:dep.rc 2 dep:3};
-$output = qx{../task rc:dep.rc 1 dep:3};
+qx{../src/task rc:dep.rc 1 dep:2};
+qx{../src/task rc:dep.rc add Three};
+qx{../src/task rc:dep.rc 2 dep:3};
+$output = qx{../src/task rc:dep.rc 1 dep:3};
 unlike ($output, qr/Circular dependency detected and disallowed\./, 'dependencies - diamond, non-circular');
 like   ($output, qr/Modified 1 task\./,                             'dependencies - diamond, non-circular');
 
@@ -96,16 +96,16 @@ like   ($output, qr/Modified 1 task\./,                             'dependencie
 unlink 'pending.data';
 ok (!-r 'pending.data', 'Removed pending.data for a fresh start');
 
-qx{../task rc:dep.rc add One};
-qx{../task rc:dep.rc add Two};
-qx{../task rc:dep.rc add Three};
-qx{../task rc:dep.rc add Four};
-qx{../task rc:dep.rc add Five};
+qx{../src/task rc:dep.rc add One};
+qx{../src/task rc:dep.rc add Two};
+qx{../src/task rc:dep.rc add Three};
+qx{../src/task rc:dep.rc add Four};
+qx{../src/task rc:dep.rc add Five};
 
-qx{../task rc:dep.rc 5 dep:4; ../task rc:dep.rc 4 dep:3; ../task rc:dep.rc 3 dep:2; ../task rc:dep.rc 2 dep:1};
+qx{../src/task rc:dep.rc 5 dep:4; ../src/task rc:dep.rc 4 dep:3; ../src/task rc:dep.rc 3 dep:2; ../src/task rc:dep.rc 2 dep:1};
 
 # [17,18] 5 dep 4 dep 3 dep 2 dep 1 dep 5 => error
-$output = qx{../task rc:dep.rc 1 dep:5};
+$output = qx{../src/task rc:dep.rc 1 dep:5};
 like   ($output, qr/Circular dependency detected and disallowed\./, 'dependencies - nontrivial circular');
 unlike ($output, qr/Modified 1 task\./,                             'dependencies - nontrivial circular');
 
@@ -113,108 +113,108 @@ unlike ($output, qr/Modified 1 task\./,                             'dependencie
 unlink 'pending.data';
 ok (!-r 'pending.data', 'Removed pending.data for a fresh start');
 
-qx{../task rc:dep.rc add One};
-qx{../task rc:dep.rc add Two};
-qx{../task rc:dep.rc add Three};
-qx{../task rc:dep.rc add Four};
-qx{../task rc:dep.rc add Five};
-qx{../task rc:dep.rc add Six recurring due:tomorrow recur:daily};
+qx{../src/task rc:dep.rc add One};
+qx{../src/task rc:dep.rc add Two};
+qx{../src/task rc:dep.rc add Three};
+qx{../src/task rc:dep.rc add Four};
+qx{../src/task rc:dep.rc add Five};
+qx{../src/task rc:dep.rc add Six recurring due:tomorrow recur:daily};
 
 # [20]
-qx{../task rc:dep.rc ls}; # To force handleRecurrence call.
-$output = qx{../task rc:dep.rc 6 dep:5};
+qx{../src/task rc:dep.rc ls}; # To force handleRecurrence call.
+$output = qx{../src/task rc:dep.rc 6 dep:5};
 like ($output, qr/Modified \d+ task/, 'dependencies - recurring task depending on another task');
 
 # [21]
-$output = qx{../task rc:dep.rc 4 dep:5};
+$output = qx{../src/task rc:dep.rc 4 dep:5};
 like ($output, qr/Modified \d+ task/, 'dependencies - task depending on recurring task');
 
 # [22] t 1 dep:2,3,4; t 1 dep:-2,-4,5; t info 1 => blocked by 3,5
-$output = qx{../task rc:dep.rc 1 dep:2,3,4; ../task rc:dep.rc 1 dep:-2,-4,5; ../task rc:dep.rc info 1};
+$output = qx{../src/task rc:dep.rc 1 dep:2,3,4; ../src/task rc:dep.rc 1 dep:-2,-4,5; ../src/task rc:dep.rc info 1};
 like ($output, qr/This task blocked by\s+3 Three\n\s+5 Five\nUUID/, 'dependencies - multiple dependencies modified');
 
 # [23,24]
-$output = qx{../task rc:dep.rc do 3,5; ../task rc:dep.rc info 1};
+$output = qx{../src/task rc:dep.rc do 3,5; ../src/task rc:dep.rc info 1};
 unlike ($output, qr/This task blocked by/, 'dependencies - task info reflects completed dependencies');
 unlike ($output, qr/This task is blocking/, 'dependencies - task info reflects completed dependencies');
 
 # [25]
-$output = qx{../task rc:dep.rc depreport};
+$output = qx{../src/task rc:dep.rc depreport};
 like ($output, qr/\s1\s+One\s+/, 'dependencies - depends report column reflects completed dependencies');
 
 # [26]
 unlink 'pending.data';
 ok (!-r 'pending.data', 'Removed pending.data for a fresh start');
 
-qx{../task rc:dep.rc add One};
-qx{../task rc:dep.rc add Two};
-qx{../task rc:dep.rc add Three};
-qx{../task rc:dep.rc add Four};
+qx{../src/task rc:dep.rc add One};
+qx{../src/task rc:dep.rc add Two};
+qx{../src/task rc:dep.rc add Three};
+qx{../src/task rc:dep.rc add Four};
 
-qx{../task rc:dep.rc 1 dep:3,4};
-qx{../task rc:dep.rc do 2};
+qx{../src/task rc:dep.rc 1 dep:3,4};
+qx{../src/task rc:dep.rc do 2};
 
 # [27]
-$output = qx{../task rc:dep.rc depreport};
+$output = qx{../src/task rc:dep.rc depreport};
 like ($output, qr/\s1\s+2,3\s+One\s+/, 'dependencies - depends report column reflects changed IDs');
 
 # [28]
-qx{../task rc:dep.rc do 3};
-$output = qx{../task rc:dep.rc depreport};
+qx{../src/task rc:dep.rc do 3};
+$output = qx{../src/task rc:dep.rc depreport};
 like ($output, qr/\s1\s+2\s+One\s+/, 'dependencies - depends report column reflects completed dependencies');
 
 # [29]
 unlink 'pending.data';
 ok (!-r 'pending.data', 'Removed pending.data for a fresh start');
 
-qx{../task rc:dep.rc add One};
-qx{../task rc:dep.rc add Two};
-qx{../task rc:dep.rc add Three};
-qx{../task rc:dep.rc add Four};
+qx{../src/task rc:dep.rc add One};
+qx{../src/task rc:dep.rc add Two};
+qx{../src/task rc:dep.rc add Three};
+qx{../src/task rc:dep.rc add Four};
 
-qx{../task rc:dep.rc 2 dep:1; ../task rc:dep.rc 3 dep:2; ../task rc:dep.rc 4 dep:3};
+qx{../src/task rc:dep.rc 2 dep:1; ../src/task rc:dep.rc 3 dep:2; ../src/task rc:dep.rc 4 dep:3};
 
 # [30,31]
-$output = qx{echo y | ../task rc:dep.rc do 2};
+$output = qx{echo y | ../src/task rc:dep.rc do 2};
 like ($output, qr/fixed/, 'dependencies - user prompted to fix broken chain after completing a blocked task');
 like ($output, qr/is blocked by/, 'dependencies - user nagged for completing a blocked task');
 
 # [32]
-$output = qx{echo y | ../task rc:dep.rc do 1};
+$output = qx{echo y | ../src/task rc:dep.rc do 1};
 unlike ($output, qr/fixed/, 'dependencies - user not prompted to fix broken chain when the head of the chain is marked as complete');
 
 # [33]
-$output = qx{echo y | ../task rc:dep.rc del 4};
+$output = qx{echo y | ../src/task rc:dep.rc del 4};
 unlike ($output, qr/fixed/, 'dependencies - user not prompted to fix broken chain when the tail of the chain is deleted');
 
 # [34]
 unlink 'pending.data';
 ok (!-r 'pending.data', 'Removed pending.data for a fresh start');
 
-qx{../task rc:dep.rc add One};
-qx{../task rc:dep.rc add Two};
-qx{../task rc:dep.rc add Three};
-qx{../task rc:dep.rc add Four};
-qx{../task rc:dep.rc add Five};
+qx{../src/task rc:dep.rc add One};
+qx{../src/task rc:dep.rc add Two};
+qx{../src/task rc:dep.rc add Three};
+qx{../src/task rc:dep.rc add Four};
+qx{../src/task rc:dep.rc add Five};
 
-qx{../task rc:dep.rc 2 dep:1};
-qx{../task rc:dep.rc 3 dep:2};
-qx{../task rc:dep.rc 4 dep:3};
-qx{../task rc:dep.rc 5 dep:4};
+qx{../src/task rc:dep.rc 2 dep:1};
+qx{../src/task rc:dep.rc 3 dep:2};
+qx{../src/task rc:dep.rc 4 dep:3};
+qx{../src/task rc:dep.rc 5 dep:4};
 
 # [35]
-qx{echo y | ../task rc:dep.rc do 2};
-$output = qx{../task rc:dep.rc depreport};
+qx{echo y | ../src/task rc:dep.rc do 2};
+$output = qx{../src/task rc:dep.rc depreport};
 like ($output, qr/\s1\s+One\s*\n\s2\s+1\s+Three\s*\n\s3\s+2\s+Four\s*\n\s4\s+3\s+Five/, 'dependencies - fixed chain after completing a blocked task');
 
 # [36]
-qx{printf "Y\nY\n" | ../task rc:dep.rc del 2}; 
-$output = qx{../task rc:dep.rc depreport};
+qx{printf "Y\nY\n" | ../src/task rc:dep.rc del 2}; 
+$output = qx{../src/task rc:dep.rc depreport};
 like ($output, qr/\s1\s+One\s*\n\s2\s+1\s+Four\s*\n\s3\s+2\s+Five/, 'dependencies - fixed chain after deleting a blocked task');
 
 # [37]
-qx{../task rc:dep.rc 2 dep:-1}; 
-$output = qx{../task rc:dep.rc depreport};
+qx{../src/task rc:dep.rc 2 dep:-1}; 
+$output = qx{../src/task rc:dep.rc depreport};
 like ($output, qr/\s1\s+One\s*\n\s2\s+Four\s*\n\s3\s+2\s+Five/, 'dependencies - chain should not be automatically repaired after manually removing a dependency');
 
 # TODO - test dependency.confirmation config variable
diff --git a/test/due.t b/test/due.t
index 3ae83f618..408b91678 100755
--- a/test/due.t
+++ b/test/due.t
@@ -51,17 +51,17 @@ my $just = sprintf ("%d/%d/%d", $m + 1, $d, $y + 1900);
 ($d, $m, $y) = (localtime (time + 5 * 86_400))[3..5];
 my $almost = sprintf ("%d/%d/%d", $m + 1, $d, $y + 1900);
 
-qx{../task rc:due.rc add one due:$just};
-qx{../task rc:due.rc add two due:$almost};
-my $output = qx{../task rc:due.rc list};
+qx{../src/task rc:due.rc add one due:$just};
+qx{../src/task rc:due.rc add two due:$almost};
+my $output = qx{../src/task rc:due.rc list};
 like ($output, qr/\[31m.+$just.+\[0m/, 'one marked due');
 like ($output, qr/\s+$almost\s+/, 'two not marked due');
 
-qx{../task rc:due.rc add three due:today};
-$output = qx{../task rc:due.rc list due:today};
+qx{../src/task rc:due.rc add three due:today};
+$output = qx{../src/task rc:due.rc list due:today};
 like ($output, qr/three/, 'due:today works as a filter');
 
-$output = qx{../task rc:due.rc list due.is:today};
+$output = qx{../src/task rc:due.rc list due.is:today};
 like ($output, qr/three/, 'due.is:today works as a filter');
 
 # Cleanup.
diff --git a/test/duplicate.t b/test/duplicate.t
index 1e0f25387..46e93abaf 100755
--- a/test/duplicate.t
+++ b/test/duplicate.t
@@ -39,16 +39,16 @@ if (open my $fh, '>', 'dup.rc')
 }
 
 # Test the duplicate command.
-qx{../task rc:dup.rc add foo};
-qx{../task rc:dup.rc duplicate 1};
-my $output = qx{../task rc:dup.rc info 2};
+qx{../src/task rc:dup.rc add foo};
+qx{../src/task rc:dup.rc duplicate 1};
+my $output = qx{../src/task rc:dup.rc info 2};
 like ($output, qr/ID\s+2/,            'duplicate new id');
 like ($output, qr/Status\s+Pending/,  'duplicate same status');
 like ($output, qr/Description\s+foo/, 'duplicate same description');
 
 # Test the en passant modification while duplicating.
-qx{../task rc:dup.rc duplicate 1 priority:H /foo/FOO/ +tag};
-$output = qx{../task rc:dup.rc info 3};
+qx{../src/task rc:dup.rc duplicate 1 priority:H /foo/FOO/ +tag};
+$output = qx{../src/task rc:dup.rc info 3};
 like ($output, qr/ID\s+3/,            'duplicate new id');
 like ($output, qr/Status\s+Pending/,  'duplicate same status');
 like ($output, qr/Description\s+FOO/, 'duplicate modified description');
@@ -56,7 +56,7 @@ like ($output, qr/Priority\s+H/,      'duplicate added priority');
 like ($output, qr/Tags\s+tag/,        'duplicate added tag');
 
 # Test the output of the duplicate command - returning id of duplicated task
-$output = qx{../task rc:dup.rc duplicate 1};
+$output = qx{../src/task rc:dup.rc duplicate 1};
 like ($output, qr/Duplicated\s+1\s+'foo'/, 'duplicate output task id and description');
 like ($output, qr/Created\s+task\s+4/,     'duplicate output of new task id');
 
diff --git a/test/enpassant.t b/test/enpassant.t
index 1bbc0304f..56a7f5ba8 100755
--- a/test/enpassant.t
+++ b/test/enpassant.t
@@ -39,15 +39,15 @@ if (open my $fh, '>', 'enp.rc')
 }
 
 # Test the en passant feature.
-qx{../task rc:enp.rc add foo};
-qx{../task rc:enp.rc add foo bar};
-qx{../task rc:enp.rc do 1,2 /foo/FOO/ pri:H +tag};
-my $output = qx{../task rc:enp.rc info 1};
+qx{../src/task rc:enp.rc add foo};
+qx{../src/task rc:enp.rc add foo bar};
+qx{../src/task rc:enp.rc do 1,2 /foo/FOO/ pri:H +tag};
+my $output = qx{../src/task rc:enp.rc info 1};
 like ($output, qr/Status\s+Completed/,    'en passant 1 status change');
 like ($output, qr/Description\s+FOO/,     'en passant 1 description change');
 like ($output, qr/Priority\s+H/,          'en passant 1 description change');
 like ($output, qr/Tags\s+tag/,            'en passant 1 description change');
-$output = qx{../task rc:enp.rc info 2};
+$output = qx{../src/task rc:enp.rc info 2};
 like ($output, qr/Status\s+Completed/,    'en passant 2 status change');
 like ($output, qr/Description\s+FOO bar/, 'en passant 2 description change');
 like ($output, qr/Priority\s+H/,          'en passant 2 description change');
diff --git a/test/export.csv.t b/test/export.csv.t
index 8a7fd7d1d..68f386f1a 100755
--- a/test/export.csv.t
+++ b/test/export.csv.t
@@ -39,9 +39,9 @@ if (open my $fh, '>', 'export.rc')
 }
 
 # Add two tasks, export, examine result.
-qx{../task rc:export.rc add priority:H project:A one};
-qx{../task rc:export.rc add +tag1 +tag2 two};
-qx{../task rc:export.rc export.csv > ./export.txt};
+qx{../src/task rc:export.rc add priority:H project:A one};
+qx{../src/task rc:export.rc add +tag1 +tag2 two};
+qx{../src/task rc:export.rc export.csv > ./export.txt};
 
 my @lines;
 if (open my $fh, '<', './export.txt')
diff --git a/test/export.yaml.t b/test/export.yaml.t
index 9deea14d9..070aa144a 100755
--- a/test/export.yaml.t
+++ b/test/export.yaml.t
@@ -39,9 +39,9 @@ if (open my $fh, '>', 'export.rc')
 }
 
 # Add two tasks, export, examine result.
-qx{../task rc:export.rc add priority:H project:A one};
-qx{../task rc:export.rc add +tag1 +tag2 two};
-qx{../task rc:export.rc export.yaml > ./export.txt};
+qx{../src/task rc:export.rc add priority:H project:A one};
+qx{../src/task rc:export.rc add +tag1 +tag2 two};
+qx{../src/task rc:export.rc export.yaml > ./export.txt};
 
 my @lines;
 if (open my $fh, '<', './export.txt')
diff --git a/test/feature.exit.t b/test/feature.exit.t
index ba2f50167..1b1048083 100755
--- a/test/feature.exit.t
+++ b/test/feature.exit.t
@@ -39,10 +39,10 @@ if (open my $fh, '>', 'exit.rc')
   ok (-r 'exit.rc', 'Created exit.rc');
 }
 
-qx{../task rc:exit.rc add foo};
-my $exit_good = system ('../task rc:exit.rc ls foo 2>&1 >>/dev/null');
+qx{../src/task rc:exit.rc add foo};
+my $exit_good = system ('../src/task rc:exit.rc ls foo 2>&1 >>/dev/null');
 is ($exit_good, 0, 'task returns 0 on success');
-my $exit_bad  = system ('../task rc:exit.rc ls bar 2>&1 >>/dev/null');
+my $exit_bad  = system ('../src/task rc:exit.rc ls bar 2>&1 >>/dev/null');
 isnt ($exit_bad, 0, 'task returns non-zero on failure');
 
 # Cleanup.
diff --git a/test/filter.t b/test/filter.t
index bff187151..5a029b972 100755
--- a/test/filter.t
+++ b/test/filter.t
@@ -39,15 +39,15 @@ if (open my $fh, '>', 'filter.rc')
 }
 
 # Test the filters.
-qx{../task rc:filter.rc add project:A priority:H +tag one foo};
-qx{../task rc:filter.rc add project:A priority:H      two};
-qx{../task rc:filter.rc add project:A                 three};
-qx{../task rc:filter.rc add           priority:H      four};
-qx{../task rc:filter.rc add                      +tag five};
-qx{../task rc:filter.rc add                           six foo};
-qx{../task rc:filter.rc add           priority:L      seven bar foo};
+qx{../src/task rc:filter.rc add project:A priority:H +tag one foo};
+qx{../src/task rc:filter.rc add project:A priority:H      two};
+qx{../src/task rc:filter.rc add project:A                 three};
+qx{../src/task rc:filter.rc add           priority:H      four};
+qx{../src/task rc:filter.rc add                      +tag five};
+qx{../src/task rc:filter.rc add                           six foo};
+qx{../src/task rc:filter.rc add           priority:L      seven bar foo};
 
-my $output = qx{../task rc:filter.rc list};
+my $output = qx{../src/task rc:filter.rc list};
 like   ($output, qr/one/,   'a1');
 like   ($output, qr/two/,   'a2');
 like   ($output, qr/three/, 'a3');
@@ -56,7 +56,7 @@ like   ($output, qr/five/,  'a5');
 like   ($output, qr/six/,   'a6');
 like   ($output, qr/seven/, 'a7');
 
-$output = qx{../task rc:filter.rc list project:A};
+$output = qx{../src/task rc:filter.rc list project:A};
 like   ($output, qr/one/,   'b1');
 like   ($output, qr/two/,   'b2');
 like   ($output, qr/three/, 'b3');
@@ -65,7 +65,7 @@ unlike ($output, qr/five/,  'b5');
 unlike ($output, qr/six/,   'b6');
 unlike ($output, qr/seven/, 'b7');
 
-$output = qx{../task rc:filter.rc list priority:H};
+$output = qx{../src/task rc:filter.rc list priority:H};
 like   ($output, qr/one/,   'c1');
 like   ($output, qr/two/,   'c2');
 unlike ($output, qr/three/, 'c3');
@@ -74,7 +74,7 @@ unlike ($output, qr/five/,  'c5');
 unlike ($output, qr/six/,   'c6');
 unlike ($output, qr/seven/, 'c7');
 
-$output = qx{../task rc:filter.rc list priority:};
+$output = qx{../src/task rc:filter.rc list priority:};
 unlike ($output, qr/one/,   'd1');
 unlike ($output, qr/two/,   'd2');
 like   ($output, qr/three/, 'd3');
@@ -83,7 +83,7 @@ like   ($output, qr/five/,  'd5');
 like   ($output, qr/six/,   'd6');
 unlike ($output, qr/seven/, 'd7');
 
-$output = qx{../task rc:filter.rc list foo};
+$output = qx{../src/task rc:filter.rc list foo};
 like   ($output, qr/one/,   'e1');
 unlike ($output, qr/two/,   'e2');
 unlike ($output, qr/three/, 'e3');
@@ -92,7 +92,7 @@ unlike ($output, qr/five/,  'e5');
 like   ($output, qr/six/,   'e6');
 like   ($output, qr/seven/, 'e7');
 
-$output = qx{../task rc:filter.rc list foo bar};
+$output = qx{../src/task rc:filter.rc list foo bar};
 unlike ($output, qr/one/,   'f1');
 unlike ($output, qr/two/,   'f2');
 unlike ($output, qr/three/, 'f3');
@@ -101,7 +101,7 @@ unlike ($output, qr/five/,  'f5');
 unlike ($output, qr/six/,   'f6');
 like   ($output, qr/seven/, 'f7');
 
-$output = qx{../task rc:filter.rc list +tag};
+$output = qx{../src/task rc:filter.rc list +tag};
 like   ($output, qr/one/,   'g1');
 unlike ($output, qr/two/,   'g2');
 unlike ($output, qr/three/, 'g3');
@@ -110,7 +110,7 @@ like   ($output, qr/five/,  'g5');
 unlike ($output, qr/six/,   'g6');
 unlike ($output, qr/seven/, 'g7');
 
-$output = qx{../task rc:filter.rc list -tag};
+$output = qx{../src/task rc:filter.rc list -tag};
 unlike ($output, qr/one/,   'h1');
 like   ($output, qr/two/,   'h2');
 like   ($output, qr/three/, 'h3');
@@ -119,7 +119,7 @@ unlike ($output, qr/five/,  'h5');
 like   ($output, qr/six/,   'h6');
 like   ($output, qr/seven/, 'h7');
 
-$output = qx{../task rc:filter.rc list -missing};
+$output = qx{../src/task rc:filter.rc list -missing};
 like   ($output, qr/one/,   'i1');
 like   ($output, qr/two/,   'i2');
 like   ($output, qr/three/, 'i3');
@@ -128,7 +128,7 @@ like   ($output, qr/five/,  'i5');
 like   ($output, qr/six/,   'i6');
 like   ($output, qr/seven/, 'i7');
 
-$output = qx{../task rc:filter.rc list +tag -tag};
+$output = qx{../src/task rc:filter.rc list +tag -tag};
 unlike ($output, qr/one/,   'j1');
 unlike ($output, qr/two/,   'j2');
 unlike ($output, qr/three/, 'j3');
@@ -137,7 +137,7 @@ unlike ($output, qr/five/,  'j5');
 unlike ($output, qr/six/,   'j6');
 unlike ($output, qr/seven/, 'j7');
 
-$output = qx{../task rc:filter.rc list project:A priority:H};
+$output = qx{../src/task rc:filter.rc list project:A priority:H};
 like   ($output, qr/one/,   'k1');
 like   ($output, qr/two/,   'k2');
 unlike ($output, qr/three/, 'k3');
@@ -146,7 +146,7 @@ unlike ($output, qr/five/,  'k5');
 unlike ($output, qr/six/,   'k6');
 unlike ($output, qr/seven/, 'k7');
 
-$output = qx{../task rc:filter.rc list project:A priority:};
+$output = qx{../src/task rc:filter.rc list project:A priority:};
 unlike ($output, qr/one/,   'l1');
 unlike ($output, qr/two/,   'l2');
 like   ($output, qr/three/, 'l3');
@@ -155,7 +155,7 @@ unlike ($output, qr/five/,  'l5');
 unlike ($output, qr/six/,   'l6');
 unlike ($output, qr/seven/, 'l7');
 
-$output = qx{../task rc:filter.rc list project:A foo};
+$output = qx{../src/task rc:filter.rc list project:A foo};
 like   ($output, qr/one/,   'm1');
 unlike ($output, qr/two/,   'm2');
 unlike ($output, qr/three/, 'm3');
@@ -164,7 +164,7 @@ unlike ($output, qr/five/,  'm5');
 unlike ($output, qr/six/,   'm6');
 unlike ($output, qr/seven/, 'm7');
 
-$output = qx{../task rc:filter.rc list project:A +tag};
+$output = qx{../src/task rc:filter.rc list project:A +tag};
 like   ($output, qr/one/,   'n1');
 unlike ($output, qr/two/,   'n2');
 unlike ($output, qr/three/, 'n3');
@@ -173,7 +173,7 @@ unlike ($output, qr/five/,  'n5');
 unlike ($output, qr/six/,   'n6');
 unlike ($output, qr/seven/, 'n7');
 
-$output = qx{../task rc:filter.rc list project:A priority:H foo};
+$output = qx{../src/task rc:filter.rc list project:A priority:H foo};
 like   ($output, qr/one/,   'o1');
 unlike ($output, qr/two/,   'o2');
 unlike ($output, qr/three/, 'o3');
@@ -182,7 +182,7 @@ unlike ($output, qr/five/,  'o5');
 unlike ($output, qr/six/,   'o6');
 unlike ($output, qr/seven/, 'o7');
 
-$output = qx{../task rc:filter.rc list project:A priority:H +tag};
+$output = qx{../src/task rc:filter.rc list project:A priority:H +tag};
 like   ($output, qr/one/,   'p1');
 unlike ($output, qr/two/,   'p2');
 unlike ($output, qr/three/, 'p3');
@@ -191,7 +191,7 @@ unlike ($output, qr/five/,  'p5');
 unlike ($output, qr/six/,   'p6');
 unlike ($output, qr/seven/, 'p7');
 
-$output = qx{../task rc:filter.rc list project:A priority:H foo +tag};
+$output = qx{../src/task rc:filter.rc list project:A priority:H foo +tag};
 like   ($output, qr/one/,   'q1');
 unlike ($output, qr/two/,   'q2');
 unlike ($output, qr/three/, 'q3');
@@ -200,7 +200,7 @@ unlike ($output, qr/five/,  'q5');
 unlike ($output, qr/six/,   'q6');
 unlike ($output, qr/seven/, 'q7');
 
-$output = qx{../task rc:filter.rc list project:A priority:H foo +tag baz};
+$output = qx{../src/task rc:filter.rc list project:A priority:H foo +tag baz};
 unlike ($output, qr/one/,   'r1');
 unlike ($output, qr/two/,   'r2');
 unlike ($output, qr/three/, 'r3');
@@ -210,7 +210,7 @@ unlike ($output, qr/six/,   'r6');
 unlike ($output, qr/seven/, 'r7');
 
 # Regex filters.
-$output = qx{../task rc:filter.rc list rc.regex:on project:[A-Z]};
+$output = qx{../src/task rc:filter.rc list rc.regex:on project:[A-Z]};
 like   ($output, qr/one/,   's1');
 like   ($output, qr/two/,   's2');
 like   ($output, qr/three/, 's3');
@@ -219,7 +219,7 @@ unlike ($output, qr/five/,  's5');
 unlike ($output, qr/six/,   's6');
 unlike ($output, qr/seven/, 's7');
 
-$output = qx{../task rc:filter.rc list rc.regex:on project:.};
+$output = qx{../src/task rc:filter.rc list rc.regex:on project:.};
 like   ($output, qr/one/,   't1');
 like   ($output, qr/two/,   't2');
 like   ($output, qr/three/, 't3');
@@ -228,7 +228,7 @@ unlike ($output, qr/five/,  't5');
 unlike ($output, qr/six/,   't6');
 unlike ($output, qr/seven/, 't7');
 
-$output = qx{../task rc:filter.rc rc.regex:on list fo\{2\}};
+$output = qx{../src/task rc:filter.rc rc.regex:on list fo\{2\}};
 like   ($output, qr/one/,   'u1');
 unlike ($output, qr/two/,   'u2');
 unlike ($output, qr/three/, 'u3');
@@ -237,7 +237,7 @@ unlike ($output, qr/five/,  'u5');
 like   ($output, qr/six/,   'u6');
 like   ($output, qr/seven/, 'u7');
 
-$output = qx{../task rc:filter.rc rc.regex:on list f.. b..};
+$output = qx{../src/task rc:filter.rc rc.regex:on list f.. b..};
 unlike ($output, qr/one/,   'v1');
 unlike ($output, qr/two/,   'v2');
 unlike ($output, qr/three/, 'v3');
@@ -246,7 +246,7 @@ unlike ($output, qr/five/,  'v5');
 unlike ($output, qr/six/,   'v6');
 like   ($output, qr/seven/, 'v7');
 
-$output = qx{../task rc:filter.rc rc.regex:on list ^s};
+$output = qx{../src/task rc:filter.rc rc.regex:on list ^s};
 unlike ($output, qr/one/,   'w1');
 unlike ($output, qr/two/,   'w2');
 unlike ($output, qr/three/, 'w3');
@@ -255,7 +255,7 @@ unlike ($output, qr/five/,  'w5');
 like   ($output, qr/six/,   'w6');
 like   ($output, qr/seven/, 'w7');
 
-$output = qx{../task rc:filter.rc rc.regex:on list ^.i};
+$output = qx{../src/task rc:filter.rc rc.regex:on list ^.i};
 unlike ($output, qr/one/,   'x1');
 unlike ($output, qr/two/,   'x2');
 unlike ($output, qr/three/, 'x3');
@@ -264,7 +264,7 @@ like   ($output, qr/five/,  'x5');
 like   ($output, qr/six/,   'x6');
 unlike ($output, qr/seven/, 'x7');
 
-$output = qx{../task rc:filter.rc rc.regex:on list "two|five"};
+$output = qx{../src/task rc:filter.rc rc.regex:on list "two|five"};
 unlike ($output, qr/one/,   'y1');
 like   ($output, qr/two/,   'y2');
 unlike ($output, qr/three/, 'y3');
diff --git a/test/fontunderline.t b/test/fontunderline.t
index eaed70d4c..20082d184 100755
--- a/test/fontunderline.t
+++ b/test/fontunderline.t
@@ -54,22 +54,22 @@ if (open my $fh, '>', 'font.rc')
 #
 # * When isatty (fileno (stdout)) is false, color is automatically disabled.
 
-qx{../task rc:font.rc add foo};
-my $output = qx{../task 1 info rc:font.rc rc.color:off rc._forcecolor:off rc.fontunderline:off};
+qx{../src/task rc:font.rc add foo};
+my $output = qx{../src/task 1 info rc:font.rc rc.color:off rc._forcecolor:off rc.fontunderline:off};
 like   ($output, qr/--------/, '0,0,0 -> dashes');
-$output = qx{../task 1 info rc:font.rc rc.color:off rc._forcecolor:off rc.fontunderline:on};
+$output = qx{../src/task 1 info rc:font.rc rc.color:off rc._forcecolor:off rc.fontunderline:on};
 like   ($output, qr/--------/, '0,0,1 -> dashes');
-$output = qx{../task 1 info rc:font.rc rc.color:off rc._forcecolor:on rc.fontunderline:off};
+$output = qx{../src/task 1 info rc:font.rc rc.color:off rc._forcecolor:on rc.fontunderline:off};
 like   ($output, qr/--------/, '0,1,0 -> dashes');
-$output = qx{../task 1 info rc:font.rc rc.color:off rc._forcecolor:on rc.fontunderline:on};
+$output = qx{../src/task 1 info rc:font.rc rc.color:off rc._forcecolor:on rc.fontunderline:on};
 unlike ($output, qr/--------/, '0,1,1 -> underline');
-$output = qx{../task 1 info rc:font.rc rc.color:on rc._forcecolor:off rc.fontunderline:off};
+$output = qx{../src/task 1 info rc:font.rc rc.color:on rc._forcecolor:off rc.fontunderline:off};
 like   ($output, qr/--------/, '1,0,0 -> dashes');
-$output = qx{../task 1 info rc:font.rc rc.color:on rc._forcecolor:off rc.fontunderline:on};
+$output = qx{../src/task 1 info rc:font.rc rc.color:on rc._forcecolor:off rc.fontunderline:on};
 like   ($output, qr/--------/, '1,0,1 -> dashes');
-$output = qx{../task 1 info rc:font.rc rc.color:on rc._forcecolor:on rc.fontunderline:off};
+$output = qx{../src/task 1 info rc:font.rc rc.color:on rc._forcecolor:on rc.fontunderline:off};
 like   ($output, qr/--------/, '1,1,0 -> dashes');
-$output = qx{../task 1 info rc:font.rc rc.color:on rc._forcecolor:on rc.fontunderline:on};
+$output = qx{../src/task 1 info rc:font.rc rc.color:on rc._forcecolor:on rc.fontunderline:on};
 unlike ($output, qr/--------/, '1,1,1 -> underline');
 
 # Cleanup.
diff --git a/test/history.annual.t b/test/history.annual.t
index ded5ac97a..c1161c794 100755
--- a/test/history.annual.t
+++ b/test/history.annual.t
@@ -62,7 +62,7 @@ EOF
   ok (-r 'pending.data', 'Created pending.data');
 }
 
-my $output = qx{../task rc:time.rc history.annual};
+my $output = qx{../src/task rc:time.rc history.annual};
 like ($output, qr/7\s+1\s+0\s+6/, 'history.annual - last year');
 like ($output, qr/2\s+3\s+3\s+-4/, 'history.annual - this year');
 like ($output, qr/4\s+2\s+1\s+1/, 'history.annual - average');
diff --git a/test/history.monthly.t b/test/history.monthly.t
index 7a619cf7c..7d6ef311a 100755
--- a/test/history.monthly.t
+++ b/test/history.monthly.t
@@ -62,7 +62,7 @@ EOF
   ok (-r 'pending.data', 'Created pending.data');
 }
 
-my $output = qx{../task rc:time.rc history.monthly};
+my $output = qx{../src/task rc:time.rc history.monthly};
 like ($output, qr/7\s+1\s+0\s+6/, 'history.monthly - last month');
 like ($output, qr/2\s+3\s+3\s+-4/, 'history.monthly - this month');
 like ($output, qr/4\s+2\s+1\s+1/, 'history.monthly - average');
diff --git a/test/hook.api.task_debug.t b/test/hook.api.task_debug.t
index 8272e95c0..fe1cf9123 100755
--- a/test/hook.api.task_debug.t
+++ b/test/hook.api.task_debug.t
@@ -48,12 +48,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/DEBUG MESSAGE/ms, 'Hook called task_debug_message');
 }
 else
diff --git a/test/hook.api.task_exit.t b/test/hook.api.task_exit.t
index b7caa4882..49700d04b 100755
--- a/test/hook.api.task_exit.t
+++ b/test/hook.api.task_exit.t
@@ -47,11 +47,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  $output = qx{../task rc:hook.rc _version};
+  $output = qx{../src/task rc:hook.rc _version};
   like ($output, qr/^Exiting.$/ms, 'Hook called task_exit');
 }
 else
diff --git a/test/hook.api.task_feature.t b/test/hook.api.task_feature.t
index 6ca04a97c..f9f6b127e 100755
--- a/test/hook.api.task_feature.t
+++ b/test/hook.api.task_feature.t
@@ -55,11 +55,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  $output = qx{../task rc:hook.rc _version};
+  $output = qx{../src/task rc:hook.rc _version};
     like ($output, qr/^<<lua>>$/ms, 'Hook called task_feature (lua)');
   unlike ($output, qr/^<<foo>>$/ms, 'Hook called task_feature (foo)');
 }
diff --git a/test/hook.api.task_footnote.t b/test/hook.api.task_footnote.t
index f37dfa22f..6412e6273 100755
--- a/test/hook.api.task_footnote.t
+++ b/test/hook.api.task_footnote.t
@@ -47,12 +47,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/FOOTNOTE MESSAGE/ms, 'Hook called task_footnote_message');
 }
 else
diff --git a/test/hook.api.task_get_config.t b/test/hook.api.task_get_config.t
index 96c6e79c9..2eb257931 100755
--- a/test/hook.api.task_get_config.t
+++ b/test/hook.api.task_get_config.t
@@ -48,11 +48,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  $output = qx{../task rc:hook.rc _version};
+  $output = qx{../src/task rc:hook.rc _version};
   like ($output, qr/^NAG-STRING$/ms, 'Hook called task_get_config');
 }
 else
diff --git a/test/hook.api.task_get_description.t b/test/hook.api.task_get_description.t
index c3fd8510a..2febc6fa7 100755
--- a/test/hook.api.task_get_description.t
+++ b/test/hook.api.task_get_description.t
@@ -47,12 +47,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<foo>>$/ms, 'Hook called task_get_description');
 }
 else
diff --git a/test/hook.api.task_get_due.t b/test/hook.api.task_get_due.t
index 34288b663..a3684943f 100755
--- a/test/hook.api.task_get_due.t
+++ b/test/hook.api.task_get_due.t
@@ -50,12 +50,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo due:eom};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo due:eom};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<\d+>>$/ms, 'Hook called task_get_due');
 }
 else
diff --git a/test/hook.api.task_get_end.t b/test/hook.api.task_get_end.t
index 4ebe5f2ab..1f08d7d53 100755
--- a/test/hook.api.task_get_end.t
+++ b/test/hook.api.task_get_end.t
@@ -50,13 +50,13 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo};
-  qx{../task rc:hook.rc do 1};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo};
+  qx{../src/task rc:hook.rc do 1};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<\d+>>$/ms, 'Hook called task_get_end');
 }
 else
diff --git a/test/hook.api.task_get_entry.t b/test/hook.api.task_get_entry.t
index b2f24b585..b9cf6ffc6 100755
--- a/test/hook.api.task_get_entry.t
+++ b/test/hook.api.task_get_entry.t
@@ -50,12 +50,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<\d+>>$/ms, 'Hook called task_get_entry');
 }
 else
diff --git a/test/hook.api.task_get_priority.t b/test/hook.api.task_get_priority.t
index f67057543..f76db9a6c 100755
--- a/test/hook.api.task_get_priority.t
+++ b/test/hook.api.task_get_priority.t
@@ -47,12 +47,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo priority:M};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo priority:M};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<M>>$/ms, 'Hook called task_get_priority');
 }
 else
diff --git a/test/hook.api.task_get_project.t b/test/hook.api.task_get_project.t
index c09d20cc2..219b29f39 100755
--- a/test/hook.api.task_get_project.t
+++ b/test/hook.api.task_get_project.t
@@ -47,12 +47,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo pro:PPP};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo pro:PPP};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<PPP>>$/ms, 'Hook called task_get_project');
 }
 else
diff --git a/test/hook.api.task_get_start.t b/test/hook.api.task_get_start.t
index bb909a89f..ef695e0bc 100755
--- a/test/hook.api.task_get_start.t
+++ b/test/hook.api.task_get_start.t
@@ -50,13 +50,13 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo};
-  qx{../task rc:hook.rc start 1};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo};
+  qx{../src/task rc:hook.rc start 1};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<\d+>>$/ms, 'Hook called task_get_start');
 }
 else
diff --git a/test/hook.api.task_get_status.t b/test/hook.api.task_get_status.t
index caa4aa159..5508b8887 100755
--- a/test/hook.api.task_get_status.t
+++ b/test/hook.api.task_get_status.t
@@ -47,12 +47,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<pending>>$/ms, 'Hook called task_get_status');
 }
 else
diff --git a/test/hook.api.task_get_until.t b/test/hook.api.task_get_until.t
index ff3e10a05..53dc68a85 100755
--- a/test/hook.api.task_get_until.t
+++ b/test/hook.api.task_get_until.t
@@ -50,12 +50,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo due:tomorrow recur:weekly until:eoy};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo due:tomorrow recur:weekly until:eoy};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<\d+>>$/ms, 'Hook called task_get_until');
 }
 else
diff --git a/test/hook.api.task_get_uuid.t b/test/hook.api.task_get_uuid.t
index 41e2c639e..034034b79 100755
--- a/test/hook.api.task_get_uuid.t
+++ b/test/hook.api.task_get_uuid.t
@@ -47,12 +47,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<.+>>$/ms, 'Hook called task_get_uuid');
 }
 else
diff --git a/test/hook.api.task_get_wait.t b/test/hook.api.task_get_wait.t
index d8ea76013..0a021e19b 100755
--- a/test/hook.api.task_get_wait.t
+++ b/test/hook.api.task_get_wait.t
@@ -50,12 +50,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo wait:tomorrow};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo wait:tomorrow};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/^<<\d+>>$/ms, 'Hook called task_get_wait');
 }
 else
diff --git a/test/hook.api.task_header.t b/test/hook.api.task_header.t
index 31167330f..690110497 100755
--- a/test/hook.api.task_header.t
+++ b/test/hook.api.task_header.t
@@ -47,12 +47,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc info 1};
   like ($output, qr/HEADER MESSAGE/ms, 'Hook called task_header_message');
 }
 else
diff --git a/test/hook.api.task_lua_version.t b/test/hook.api.task_lua_version.t
index 941fc7a7e..bc90f784f 100755
--- a/test/hook.api.task_lua_version.t
+++ b/test/hook.api.task_lua_version.t
@@ -47,11 +47,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  $output = qx{../task rc:hook.rc _version};
+  $output = qx{../src/task rc:hook.rc _version};
   like ($output, qr/^<<\d\.\d+\.\d+.*>>$/ms, 'Hook called task_lua_version');
 }
 else
diff --git a/test/hook.api.task_os.t b/test/hook.api.task_os.t
index b5e88d3b1..34c8b1622 100755
--- a/test/hook.api.task_os.t
+++ b/test/hook.api.task_os.t
@@ -47,11 +47,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  $output = qx{../task rc:hook.rc _version};
+  $output = qx{../src/task rc:hook.rc _version};
 
   my ($os) = $output =~ /^<<(darwin|solaris|cygwin|openbsd|haiku|freebsd|linux)>>$/ms;
   diag ($os);
diff --git a/test/hook.api.task_version.t b/test/hook.api.task_version.t
index e9a4f75fe..232371405 100755
--- a/test/hook.api.task_version.t
+++ b/test/hook.api.task_version.t
@@ -47,11 +47,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  $output = qx{../task rc:hook.rc _version};
+  $output = qx{../src/task rc:hook.rc _version};
   like ($output, qr/^<<\d\.\d+\.\d+.*>>$/ms, 'Hook called task_version');
 }
 else
diff --git a/test/hook.format-age.t b/test/hook.format-age.t
index 3783b00aa..8b302b8a5 100755
--- a/test/hook.format-age.t
+++ b/test/hook.format-age.t
@@ -51,13 +51,13 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo};
+  qx{../src/task rc:hook.rc add foo};
   diag ("1 second delay");
   sleep 1;
-  $output = qx{../task rc:hook.rc list};
+  $output = qx{../src/task rc:hook.rc list};
 
   like ($output, qr/<\d\ssec>/, 'format-age hook age -> <age>');
 }
diff --git a/test/hook.format-age_compact.t b/test/hook.format-age_compact.t
index 9705dae8a..0fb3f10eb 100755
--- a/test/hook.format-age_compact.t
+++ b/test/hook.format-age_compact.t
@@ -52,13 +52,13 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo};
+  qx{../src/task rc:hook.rc add foo};
   diag ("1 second delay");
   sleep 1;
-  $output = qx{../task rc:hook.rc list};
+  $output = qx{../src/task rc:hook.rc list};
 
   like ($output, qr/<\ds>/, 'format-age_compact hook age -> <age>');
 }
diff --git a/test/hook.format-countdown.t b/test/hook.format-countdown.t
index dce184a9e..e11f86646 100755
--- a/test/hook.format-countdown.t
+++ b/test/hook.format-countdown.t
@@ -51,11 +51,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo due:eom};
-  $output = qx{../task rc:hook.rc long};
+  qx{../src/task rc:hook.rc add foo due:eom};
+  $output = qx{../src/task rc:hook.rc long};
 
   like ($output, qr/<-?\d+\s\D+>/, 'format-countdown hook countdown -> <countdown>');
 }
diff --git a/test/hook.format-countdown_compact.t b/test/hook.format-countdown_compact.t
index 2269547ec..e7e3bd774 100755
--- a/test/hook.format-countdown_compact.t
+++ b/test/hook.format-countdown_compact.t
@@ -53,11 +53,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo due:eom};
-  $output = qx{../task rc:hook.rc long};
+  qx{../src/task rc:hook.rc add foo due:eom};
+  $output = qx{../src/task rc:hook.rc long};
 
   like ($output, qr/<-?\d+\D+>/, 'format-countdown_compact hook countdown_compact -> <countdown_compact>');
 }
diff --git a/test/hook.format-depends.t b/test/hook.format-depends.t
index e4d9ce921..8122834d7 100755
--- a/test/hook.format-depends.t
+++ b/test/hook.format-depends.t
@@ -51,12 +51,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add one};
-  qx{../task rc:hook.rc add two depends:1};
-  $output = qx{../task rc:hook.rc long};
+  qx{../src/task rc:hook.rc add one};
+  qx{../src/task rc:hook.rc add two depends:1};
+  $output = qx{../src/task rc:hook.rc long};
 
   like ($output, qr/<1>/, 'format-depends hook 1 -> <1>');
 }
diff --git a/test/hook.format-description.t b/test/hook.format-description.t
index 6ccaaa5bf..7b5730c1c 100755
--- a/test/hook.format-description.t
+++ b/test/hook.format-description.t
@@ -51,11 +51,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc ls};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc ls};
 
   like ($output, qr/<foo>/, 'format-description hook foo -> <foo>');
 }
diff --git a/test/hook.format-description_only.t b/test/hook.format-description_only.t
index 21bbdfed9..a147f5fce 100755
--- a/test/hook.format-description_only.t
+++ b/test/hook.format-description_only.t
@@ -53,11 +53,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc ls};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc ls};
 
   like ($output, qr/<foo>/, 'format-description_only hook foo -> <foo>');
 }
diff --git a/test/hook.format-due.t b/test/hook.format-due.t
index 1beb9c887..2d4a0b1c0 100755
--- a/test/hook.format-due.t
+++ b/test/hook.format-due.t
@@ -51,11 +51,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo due:tomorrow};
-  $output = qx{../task rc:hook.rc list};
+  qx{../src/task rc:hook.rc add foo due:tomorrow};
+  $output = qx{../src/task rc:hook.rc list};
 
   like ($output, qr/<\d+\/\d+\/\d+>/, 'format-due hook due -> <due>');
 }
diff --git a/test/hook.format-end.t b/test/hook.format-end.t
index 7912db624..100611d78 100755
--- a/test/hook.format-end.t
+++ b/test/hook.format-end.t
@@ -51,12 +51,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo};
-  qx{../task rc:hook.rc do 1};
-  $output = qx{../task rc:hook.rc completed};
+  qx{../src/task rc:hook.rc add foo};
+  qx{../src/task rc:hook.rc do 1};
+  $output = qx{../src/task rc:hook.rc completed};
 
   like ($output, qr/<\d+\/\d+\/\d+>/, 'format-end hook end -> <end>');
 }
diff --git a/test/hook.format-entry.t b/test/hook.format-entry.t
index 11bb98e7d..e6ccff5fd 100755
--- a/test/hook.format-entry.t
+++ b/test/hook.format-entry.t
@@ -51,11 +51,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc long};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc long};
 
   like ($output, qr/<\d+\/\d+\/\d+>/, 'format-entry hook entry -> <entry>');
 }
diff --git a/test/hook.format-id.t b/test/hook.format-id.t
index d92bd1681..953cd06fd 100755
--- a/test/hook.format-id.t
+++ b/test/hook.format-id.t
@@ -51,12 +51,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo};
-  qx{../task rc:hook.rc add bar};
-  $output = qx{../task rc:hook.rc ls};
+  qx{../src/task rc:hook.rc add foo};
+  qx{../src/task rc:hook.rc add bar};
+  $output = qx{../src/task rc:hook.rc ls};
 
   like ($output, qr/\(1\)\s+foo/, 'format-id hook 1 -> (1)');
   like ($output, qr/\(2\)\s+bar/, 'format-id hook 2 -> (2)');
diff --git a/test/hook.format-priority-long.t b/test/hook.format-priority-long.t
index 49de3dd83..2032b0d2e 100755
--- a/test/hook.format-priority-long.t
+++ b/test/hook.format-priority-long.t
@@ -59,13 +59,13 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo pri:H};
-  qx{../task rc:hook.rc add bar pri:M};
-  qx{../task rc:hook.rc add baz pri:L};
-  $output = qx{../task rc:hook.rc ls};
+  qx{../src/task rc:hook.rc add foo pri:H};
+  qx{../src/task rc:hook.rc add bar pri:M};
+  qx{../src/task rc:hook.rc add baz pri:L};
+  $output = qx{../src/task rc:hook.rc ls};
 
   like ($output, qr/\^\^\^\^\s+foo/, 'format-priority_long hook High   -> ^^^^');
   like ($output, qr/====\s+bar/,     'format-priority_long hook Medium -> ====');
diff --git a/test/hook.format-priority.t b/test/hook.format-priority.t
index 6b8ad2a47..364a1f62f 100755
--- a/test/hook.format-priority.t
+++ b/test/hook.format-priority.t
@@ -57,13 +57,13 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo pri:H};
-  qx{../task rc:hook.rc add bar pri:M};
-  qx{../task rc:hook.rc add baz pri:L};
-  $output = qx{../task rc:hook.rc ls};
+  qx{../src/task rc:hook.rc add foo pri:H};
+  qx{../src/task rc:hook.rc add bar pri:M};
+  qx{../src/task rc:hook.rc add baz pri:L};
+  $output = qx{../src/task rc:hook.rc ls};
 
   like ($output, qr/Hi\s+foo/, 'format-priority hook H -> Hi');
   like ($output, qr/Me\s+bar/, 'format-priority hook M -> Me');
diff --git a/test/hook.format-project.t b/test/hook.format-project.t
index fe9fa6e63..b71a20388 100755
--- a/test/hook.format-project.t
+++ b/test/hook.format-project.t
@@ -51,11 +51,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo project:bar};
-  $output = qx{../task rc:hook.rc list};
+  qx{../src/task rc:hook.rc add foo project:bar};
+  $output = qx{../src/task rc:hook.rc list};
 
   like ($output, qr/<bar>/, 'format-project hook project -> <project>');
 }
diff --git a/test/hook.format-prompt.t b/test/hook.format-prompt.t
index 5d90397f0..c6c5edc5d 100755
--- a/test/hook.format-prompt.t
+++ b/test/hook.format-prompt.t
@@ -53,10 +53,10 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  my $output = qx{echo "\\nquit\\n" | ../task rc:hook.rc shell};
+  my $output = qx{echo "\\nquit\\n" | ../src/task rc:hook.rc shell};
   like ($output, qr/<foo>/, 'format-prompt hook prompt -> <prompt>');
 }
 else
diff --git a/test/hook.format-recur.t b/test/hook.format-recur.t
index 1851a78b7..7736db64c 100755
--- a/test/hook.format-recur.t
+++ b/test/hook.format-recur.t
@@ -51,11 +51,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo due:tomorrow recur:weekly};
-  $output = qx{../task rc:hook.rc long};
+  qx{../src/task rc:hook.rc add foo due:tomorrow recur:weekly};
+  $output = qx{../src/task rc:hook.rc long};
 
   like ($output, qr/<weekly>/, 'format-recur hook recur -> <recur>');
 }
diff --git a/test/hook.format-start.t b/test/hook.format-start.t
index 87ed66bb0..d4ff47936 100755
--- a/test/hook.format-start.t
+++ b/test/hook.format-start.t
@@ -51,12 +51,12 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo};
-  qx{../task rc:hook.rc start 1};
-  $output = qx{../task rc:hook.rc long};
+  qx{../src/task rc:hook.rc add foo};
+  qx{../src/task rc:hook.rc start 1};
+  $output = qx{../src/task rc:hook.rc long};
 
   like ($output, qr/<\d+\/\d+\/\d+>/, 'format-start hook start -> <start>');
 }
diff --git a/test/hook.format-tags.t b/test/hook.format-tags.t
index 07190ca14..a2101b165 100755
--- a/test/hook.format-tags.t
+++ b/test/hook.format-tags.t
@@ -51,11 +51,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo +t1 +t2};
-  $output = qx{../task rc:hook.rc long};
+  qx{../src/task rc:hook.rc add foo +t1 +t2};
+  $output = qx{../src/task rc:hook.rc long};
 
   like ($output, qr/<t1 t2>/, 'format-tags hook t1 t2 -> <t1 t2>');
 }
diff --git a/test/hook.format-uuid.t b/test/hook.format-uuid.t
index 83924dca5..19a318ad0 100755
--- a/test/hook.format-uuid.t
+++ b/test/hook.format-uuid.t
@@ -51,11 +51,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc info 1};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc info 1};
 
   like ($output, qr/UUID\s+<[0-9a-f-]+>/, 'format-uuid hook uuid -> <uuid>');
 }
diff --git a/test/hook.format-wait.t b/test/hook.format-wait.t
index 892ca44d5..308fb193a 100755
--- a/test/hook.format-wait.t
+++ b/test/hook.format-wait.t
@@ -51,11 +51,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
-  qx{../task rc:hook.rc add foo wait:tomorrow};
-  $output = qx{../task rc:hook.rc waiting};
+  qx{../src/task rc:hook.rc add foo wait:tomorrow};
+  $output = qx{../src/task rc:hook.rc waiting};
 
   like ($output, qr/<\d+\/\d+\/\d+>/, 'format-wait hook wait -> <wait>');
 }
diff --git a/test/hook.post-start.t b/test/hook.post-start.t
index 45af1c2b7..6b4424e6d 100755
--- a/test/hook.post-start.t
+++ b/test/hook.post-start.t
@@ -47,11 +47,11 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  $output = qx{../task rc:hook.rc _version};
+  $output = qx{../src/task rc:hook.rc _version};
   like ($output, qr/^marker.+\n\d\.\d+\.\d+/ms, 'Found marker before output');
 }
 else
diff --git a/test/hook.pre-completed.t b/test/hook.pre-completed.t
index ffaadcc7a..0085d6514 100755
--- a/test/hook.pre-completed.t
+++ b/test/hook.pre-completed.t
@@ -48,19 +48,19 @@ if (open my $fh, '>', 'hook')
   ok (-r 'hook', 'Created hook');
 }
 
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   my $good = $ENV{'PWD'} . '/hook:good';
   my $bad  = $ENV{'PWD'} . '/hook:bad';
 
-  qx{echo 'y'|../task rc:hook.rc config -- hook.pre-completed "$bad"};
-  qx{../task rc:hook.rc add foo};
-  $output = qx{../task rc:hook.rc done 1};
+  qx{echo 'y'|../src/task rc:hook.rc config -- hook.pre-completed "$bad"};
+  qx{../src/task rc:hook.rc add foo};
+  $output = qx{../src/task rc:hook.rc done 1};
   like ($output, qr/disallowed/, 'pre-completed hook rejected completion');
 
-  qx{echo 'y'|../task rc:hook.rc config -- hook.pre-completed "$good"};
-  $output = qx{../task rc:hook.rc done 1};
+  qx{echo 'y'|../src/task rc:hook.rc config -- hook.pre-completed "$good"};
+  $output = qx{../src/task rc:hook.rc done 1};
   like ($output, qr/Marked 1 task as done/, 'pre-completed hook allowed completion');
 }
 else
diff --git a/test/hook.pre-exit.t b/test/hook.pre-exit.t
index 4cd079348..535a4b341 100755
--- a/test/hook.pre-exit.t
+++ b/test/hook.pre-exit.t
@@ -48,11 +48,11 @@ if (open my $fh, '>', 'hook')
 }
 
 # Test the hook.
-my $output = qx{../task rc:hook.rc version};
+my $output = qx{../src/task rc:hook.rc version};
 if ($output =~ /PUC-Rio/)
 {
   # Test the hook.
-  $output = qx{../task rc:hook.rc _version};
+  $output = qx{../src/task rc:hook.rc _version};
   like ($output, qr/\n\d\.\d+\.\d+/ms, 'Found marker after output');
 }
 else
diff --git a/test/import.143.t b/test/import.143.t
index 23e03c8c3..2b8078b11 100755
--- a/test/import.143.t
+++ b/test/import.143.t
@@ -49,10 +49,10 @@ if (open my $fh, '>', 'import.txt')
   ok (-r 'import.txt', 'Created sample import data');
 }
 
-my $output = qx{../task rc:import.rc import import.txt};
+my $output = qx{../src/task rc:import.rc import import.txt};
 like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
-$output = qx{../task rc:import.rc list};
+$output = qx{../src/task rc:import.rc list};
 like ($output, qr/1.+A.+M.+foo bar/,  't1');
 like ($output, qr/2.+A.+M.+foo, bar/, 't2');
 
diff --git a/test/import.150.t b/test/import.150.t
index eea819f96..c9a9ffc8e 100755
--- a/test/import.150.t
+++ b/test/import.150.t
@@ -49,10 +49,10 @@ if (open my $fh, '>', 'import.txt')
   ok (-r 'import.txt', 'Created sample import data');
 }
 
-my $output = qx{../task rc:import.rc import import.txt};
+my $output = qx{../src/task rc:import.rc import import.txt};
 like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
-$output = qx{../task rc:import.rc list};
+$output = qx{../src/task rc:import.rc list};
 like ($output, qr/1.+A.+M.+foo bar/,  't1');
 like ($output, qr/2.+A.+M.+foo, bar/, 't2');
 
diff --git a/test/import.160.t b/test/import.160.t
index 0f3fe77d9..20670c911 100755
--- a/test/import.160.t
+++ b/test/import.160.t
@@ -49,10 +49,10 @@ if (open my $fh, '>', 'import.txt')
   ok (-r 'import.txt', 'Created sample import data');
 }
 
-my $output = qx{../task rc:import.rc import import.txt};
+my $output = qx{../src/task rc:import.rc import import.txt};
 like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
-$output = qx{../task rc:import.rc list};
+$output = qx{../src/task rc:import.rc list};
 like ($output, qr/1.+A.+M.+foo bar/,  't1');
 like ($output, qr/2.+A.+M.+foo, bar/, 't2');
 
diff --git a/test/import.cmd.t b/test/import.cmd.t
index a7979e9da..07d8a1bbd 100755
--- a/test/import.cmd.t
+++ b/test/import.cmd.t
@@ -48,10 +48,10 @@ if (open my $fh, '>', 'import.txt')
   ok (-r 'import.txt', 'Created sample import data');
 }
 
-my $output = qx{../task rc:import.rc import import.txt};
+my $output = qx{../src/task rc:import.rc import import.txt};
 like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
-$output = qx{../task rc:import.rc list};
+$output = qx{../src/task rc:import.rc list};
 like ($output, qr/1.+A.+H.+This is a test/, 't1');
 like ($output, qr/2.+Another task/,         't2');
 
diff --git a/test/import.csv.t b/test/import.csv.t
index 1e603f2f5..542e6f671 100755
--- a/test/import.csv.t
+++ b/test/import.csv.t
@@ -49,10 +49,10 @@ if (open my $fh, '>', 'import.txt')
   ok (-r 'import.txt', 'Created sample import data');
 }
 
-my $output = qx{../task rc:import.rc import import.txt};
+my $output = qx{../src/task rc:import.rc import import.txt};
 like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
-$output = qx{../task rc:import.rc list};
+$output = qx{../src/task rc:import.rc list};
 like ($output, qr/1.+H.+this is a test/, 't1');
 like ($output, qr/2.+another task/,      't2');
 
diff --git a/test/import.todo.t b/test/import.todo.t
index cd25ffe65..8e0cc1c13 100755
--- a/test/import.todo.t
+++ b/test/import.todo.t
@@ -49,14 +49,14 @@ if (open my $fh, '>', 'import.txt')
   ok (-r 'import.txt', 'Created sample import data');
 }
 
-my $output = qx{../task rc:import.rc import import.txt};
+my $output = qx{../src/task rc:import.rc import import.txt};
 like ($output, qr/Imported 3 tasks successfully, with 0 errors./, 'no errors');
 
-$output = qx{../task rc:import.rc list};
+$output = qx{../src/task rc:import.rc list};
 like ($output, qr/1.+project.+This is a test/, 't1');
 like ($output, qr/2.+H.+A prioritized task/,   't2');
 
-$output = qx{../task rc:import.rc completed};
+$output = qx{../src/task rc:import.rc completed};
 like ($output, qr/3\/25\/2009.+Walk the dog/,  't3');
 
 # Cleanup.
diff --git a/test/import.txt.t b/test/import.txt.t
index c68a55614..618a139df 100755
--- a/test/import.txt.t
+++ b/test/import.txt.t
@@ -49,10 +49,10 @@ if (open my $fh, '>', 'import.txt')
   ok (-r 'import.txt', 'Created sample import data');
 }
 
-my $output = qx{../task rc:import.rc import import.txt};
+my $output = qx{../src/task rc:import.rc import import.txt};
 like ($output, qr/Imported 3 tasks successfully, with 0 errors./, 'no errors');
 
-$output = qx{../task rc:import.rc list};
+$output = qx{../src/task rc:import.rc list};
 like ($output, qr/1.+Get milk, bread/, 't1');
 like ($output, qr/2.+Order cake/,      't2');
 like ($output, qr/3.+Clean house/,     't3');
diff --git a/test/import.url.t b/test/import.url.t
index 25f02d2b9..993b302fb 100755
--- a/test/import.url.t
+++ b/test/import.url.t
@@ -38,10 +38,10 @@ if (open my $fh, '>', 'import.rc')
   ok (-r 'import.rc', 'Created import.rc');
 }
 
-my $output = qx{../task rc:import.rc import http://taskwarrior.org/attachments/download/216/import.txt};
+my $output = qx{../src/task rc:import.rc import http://taskwarrior.org/attachments/download/216/import.txt};
 like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
 
-$output = qx{../task rc:import.rc list};
+$output = qx{../src/task rc:import.rc list};
 like ($output, qr/1.+A.+H.+This is a test/, 't1');
 like ($output, qr/2.+Another task/,         't2');
 
diff --git a/test/import.yaml.t b/test/import.yaml.t
index 09aa272aa..2b02e28e1 100755
--- a/test/import.yaml.t
+++ b/test/import.yaml.t
@@ -69,11 +69,11 @@ EOF
   ok (-r 'import.txt', 'Created sample import data');
 }
 
-my $output = qx{../task rc:import.rc import import.txt};
+my $output = qx{../src/task rc:import.rc import import.txt};
 like ($output, qr/Imported 3 tasks successfully./, 'no errors');
 # Imported 3 tasks successfully.
 
-$output = qx{../task rc:import.rc list};
+$output = qx{../src/task rc:import.rc list};
 # ID Project Pri Due Active Age     Description
 # -- ------- --- --- ------ ------- -----------
 #  1 A                      1.5 yrs zero
@@ -85,7 +85,7 @@ like   ($output, qr/1.+A.+zero/, 't1 present');
 like   ($output, qr/2.+B.+one/,  't2 present');
 unlike ($output, qr/3.+two/,     't3 missing');
 
-$output = qx{../task rc:import.rc completed};
+$output = qx{../src/task rc:import.rc completed};
 # Complete  Project Pri Age     Description
 # --------- ------- --- ------- -----------
 # 2/13/2009             1.5 yrs two
@@ -97,7 +97,7 @@ unlike ($output, qr/2.+B.+one/,        't2 missing');
 like   ($output, qr/2\/13\/2009.+two/, 't3 present');
 
 # Make sure that a duplicate task cannot be imported.
-$output = qx{../task rc:import.rc import import.txt};
+$output = qx{../src/task rc:import.rc import import.txt};
 like ($output, qr/Cannot add task because the uuid .+ is not unique\./, 'error on duplicate uuid');
 
 # Cleanup.
diff --git a/test/info.t b/test/info.t
index 5645d32d7..00ba3b9e3 100755
--- a/test/info.t
+++ b/test/info.t
@@ -40,16 +40,16 @@ if (open my $fh, '>', 'info.rc')
 }
 
 # Test the add command.
-qx{../task rc:info.rc add test one};
-qx{../task rc:info.rc add test two};
-qx{../task rc:info.rc add test three};
+qx{../src/task rc:info.rc add test one};
+qx{../src/task rc:info.rc add test two};
+qx{../src/task rc:info.rc add test three};
 
-my $output = qx{../task rc:info.rc 1};
+my $output = qx{../src/task rc:info.rc 1};
 like ($output, qr/Description\s+test one\n/, 'single auto-info one');
 unlike ($output, qr/Description\s+test two\n/, 'single auto-info !two');
 unlike ($output, qr/Description\s+test three\n/, 'single auto-info !three');
 
-$output = qx{../task rc:info.rc 1-2};
+$output = qx{../src/task rc:info.rc 1-2};
 like ($output, qr/Description\s+test one\n/, 'single auto-info one');
 like ($output, qr/Description\s+test two\n/, 'single auto-info two');
 unlike ($output, qr/Description\s+test three\n/, 'single auto-info !three');
diff --git a/test/label.t b/test/label.t
index 0e1a5654c..4fe5c9c68 100755
--- a/test/label.t
+++ b/test/label.t
@@ -44,12 +44,12 @@ if (open my $fh, '>', 'custom.rc')
 }
 
 # Generate the usage screen, and locate the custom report on it.
-my $output = qx{../task rc:custom.rc usage};
+my $output = qx{../src/task rc:custom.rc usage};
 like ($output, qr/task foo \[tags\] \[attrs\] desc\.\.\.\s+DESC\n/m, 'report.foo');
 
-qx{../task rc:custom.rc add project:A one};
-qx{../task rc:custom.rc add two};
-$output = qx{../task rc:custom.rc foo};
+qx{../src/task rc:custom.rc add project:A one};
+qx{../src/task rc:custom.rc add two};
+$output = qx{../src/task rc:custom.rc foo};
 like ($output,   qr/ID/,          'custom label for id column');
 like ($output,   qr/DESCRIPTION/, 'custom label for description column');
 like ($output,   qr/one/,         'custom filter included');
diff --git a/test/limit.t b/test/limit.t
index f43a89939..bd7bd8577 100755
--- a/test/limit.t
+++ b/test/limit.t
@@ -39,47 +39,47 @@ if (open my $fh, '>', 'limit.rc')
 }
 
 # Add a large number of tasks (> 25).
-qx{../task rc:limit.rc add one};
-qx{../task rc:limit.rc add two};
-qx{../task rc:limit.rc add three};
-qx{../task rc:limit.rc add four};
-qx{../task rc:limit.rc add five};
-qx{../task rc:limit.rc add six};
-qx{../task rc:limit.rc add seven};
-qx{../task rc:limit.rc add eight};
-qx{../task rc:limit.rc add nine};
-qx{../task rc:limit.rc add ten};
-qx{../task rc:limit.rc add eleven};
-qx{../task rc:limit.rc add twelve};
-qx{../task rc:limit.rc add thirteen};
-qx{../task rc:limit.rc add fourteen};
-qx{../task rc:limit.rc add fifteen};
-qx{../task rc:limit.rc add sixteen};
-qx{../task rc:limit.rc add seventeen};
-qx{../task rc:limit.rc add eighteen};
-qx{../task rc:limit.rc add nineteen};
-qx{../task rc:limit.rc add twenty};
-qx{../task rc:limit.rc add twenty one};
-qx{../task rc:limit.rc add twenty two};
-qx{../task rc:limit.rc add twenty three};
-qx{../task rc:limit.rc add twenty four};
-qx{../task rc:limit.rc add twenty five};
-qx{../task rc:limit.rc add twenty six};
-qx{../task rc:limit.rc add twenty seven};
-qx{../task rc:limit.rc add twenty eight};
-qx{../task rc:limit.rc add twenty nine};
-qx{../task rc:limit.rc add thirty};
+qx{../src/task rc:limit.rc add one};
+qx{../src/task rc:limit.rc add two};
+qx{../src/task rc:limit.rc add three};
+qx{../src/task rc:limit.rc add four};
+qx{../src/task rc:limit.rc add five};
+qx{../src/task rc:limit.rc add six};
+qx{../src/task rc:limit.rc add seven};
+qx{../src/task rc:limit.rc add eight};
+qx{../src/task rc:limit.rc add nine};
+qx{../src/task rc:limit.rc add ten};
+qx{../src/task rc:limit.rc add eleven};
+qx{../src/task rc:limit.rc add twelve};
+qx{../src/task rc:limit.rc add thirteen};
+qx{../src/task rc:limit.rc add fourteen};
+qx{../src/task rc:limit.rc add fifteen};
+qx{../src/task rc:limit.rc add sixteen};
+qx{../src/task rc:limit.rc add seventeen};
+qx{../src/task rc:limit.rc add eighteen};
+qx{../src/task rc:limit.rc add nineteen};
+qx{../src/task rc:limit.rc add twenty};
+qx{../src/task rc:limit.rc add twenty one};
+qx{../src/task rc:limit.rc add twenty two};
+qx{../src/task rc:limit.rc add twenty three};
+qx{../src/task rc:limit.rc add twenty four};
+qx{../src/task rc:limit.rc add twenty five};
+qx{../src/task rc:limit.rc add twenty six};
+qx{../src/task rc:limit.rc add twenty seven};
+qx{../src/task rc:limit.rc add twenty eight};
+qx{../src/task rc:limit.rc add twenty nine};
+qx{../src/task rc:limit.rc add thirty};
 
-my $output = qx{../task rc:limit.rc ls};
+my $output = qx{../src/task rc:limit.rc ls};
 like ($output, qr/^30 tasks$/ms, 'unlimited');
 
-$output = qx{../task rc:limit.rc ls limit:0};
+$output = qx{../src/task rc:limit.rc ls limit:0};
 like ($output, qr/^30 tasks$/ms, 'limited to 0 - unlimited');
 
-$output = qx{../task rc:limit.rc ls limit:3};
+$output = qx{../src/task rc:limit.rc ls limit:3};
 like ($output, qr/^30 tasks, 3 shown$/ms, 'limited to 3');
 
-$output = qx{../task rc:limit.rc ls limit:page};
+$output = qx{../src/task rc:limit.rc ls limit:page};
 like ($output, qr/^30 tasks, truncated to 17 tasks$/ms, 'limited to page');
 
 # Cleanup.
diff --git a/test/list.all.projects.t b/test/list.all.projects.t
index 1d16e9f87..f41f5f0fe 100755
--- a/test/list.all.projects.t
+++ b/test/list.all.projects.t
@@ -40,18 +40,18 @@ if (open my $fh, '>', 'projects.rc')
 
 # Create a data set of two tasks, with unique project names, one
 # pending, one completed.
-qx{../task rc:projects.rc add project:p1 one};
-qx{../task rc:projects.rc add project:p2 two};
-qx{../task rc:projects.rc done 1};
-my $output = qx{../task rc:projects.rc ls};
+qx{../src/task rc:projects.rc add project:p1 one};
+qx{../src/task rc:projects.rc add project:p2 two};
+qx{../src/task rc:projects.rc done 1};
+my $output = qx{../src/task rc:projects.rc ls};
 unlike ($output, qr/p1/, 'p1 done');
 like ($output, qr/p2/, 'p2 pending');
 
-$output = qx{../task rc:projects.rc projects};
+$output = qx{../src/task rc:projects.rc projects};
 unlike ($output, qr/p1/, 'p1 done');
 like ($output, qr/p2/, 'p2 pending');
 
-$output = qx{../task rc:projects.rc rc.list.all.projects:yes projects};
+$output = qx{../src/task rc:projects.rc rc.list.all.projects:yes projects};
 like ($output, qr/p1/, 'p1 listed');
 like ($output, qr/p2/, 'p2 listed');
 
diff --git a/test/list.all.tags.t b/test/list.all.tags.t
index 55d13fc67..49c363e6e 100755
--- a/test/list.all.tags.t
+++ b/test/list.all.tags.t
@@ -40,18 +40,18 @@ if (open my $fh, '>', 'tags.rc')
 
 # Create a data set of two tasks, with unique project names, one
 # pending, one completed.
-qx{../task rc:tags.rc add +t1 one};
-qx{../task rc:tags.rc add +t2 two};
-qx{../task rc:tags.rc done 1};
-my $output = qx{../task rc:tags.rc long};
+qx{../src/task rc:tags.rc add +t1 one};
+qx{../src/task rc:tags.rc add +t2 two};
+qx{../src/task rc:tags.rc done 1};
+my $output = qx{../src/task rc:tags.rc long};
 unlike ($output, qr/t1/, 't1 done');
 like ($output, qr/t2/, 't2 pending');
 
-$output = qx{../task rc:tags.rc tags};
+$output = qx{../src/task rc:tags.rc tags};
 unlike ($output, qr/t1/, 't1 done');
 like ($output, qr/t2/, 't2 pending');
 
-$output = qx{../task rc:tags.rc rc.list.all.tags:yes tags};
+$output = qx{../src/task rc:tags.rc rc.list.all.tags:yes tags};
 like ($output, qr/t1/, 't1 listed');
 like ($output, qr/t2/, 't2 listed');
 
diff --git a/test/log.t b/test/log.t
index ee6026f09..b4767e454 100755
--- a/test/log.t
+++ b/test/log.t
@@ -40,8 +40,8 @@ if (open my $fh, '>', 'log.rc')
 }
 
 # Test the log command.
-qx{../task rc:log.rc log This is a test};
-my $output = qx{../task rc:log.rc info 1};
+qx{../src/task rc:log.rc log This is a test};
+my $output = qx{../src/task rc:log.rc info 1};
 like ($output, qr/ID\s+1\n/, 'log ID');
 like ($output, qr/Description\s+This is a test\n/, 'log ID');
 like ($output, qr/Status\s+Completed\n/, 'log Completed');
diff --git a/test/merge.t b/test/merge.t
index 923d186a3..41aff91cb 100755
--- a/test/merge.t
+++ b/test/merge.t
@@ -70,22 +70,22 @@ if (open my $fh, '>', 'remote.rc')
 }
 
 # Create some basic tasks on both sides
-qx{../task rc:local.rc add left_modified};
+qx{../src/task rc:local.rc add left_modified};
 diag ("25 second delay");
 sleep(1);
-qx{../task rc:local.rc add right_modified};
+qx{../src/task rc:local.rc add right_modified};
 sleep(1);
-qx{../task rc:local.rc add left_newer};
+qx{../src/task rc:local.rc add left_newer};
 sleep(1);
-qx{../task rc:local.rc add right_newer};
+qx{../src/task rc:local.rc add right_newer};
 sleep(1);
-qx{../task rc:local.rc add left_deleted};
+qx{../src/task rc:local.rc add left_deleted};
 sleep(1);
-qx{../task rc:local.rc add right_deleted};
+qx{../src/task rc:local.rc add right_deleted};
 sleep(1);
-qx{../task rc:local.rc add left_completed};
+qx{../src/task rc:local.rc add left_completed};
 sleep(1);
-qx{../task rc:local.rc add right_completed};
+qx{../src/task rc:local.rc add right_completed};
 sleep(1);
 
 copy("local/undo.data", "remote/undo.data") or fail("copy local/undo.data to remote/undo.data");
@@ -93,66 +93,66 @@ copy("local/pending.data", "remote/pending.data") or fail("copy local/undo.data
 copy("local/completed.data", "remote/completed.data") or fail("copy local/undo.data to remote/undo.data");
 
 # make local modifications
-qx{../task rc:local.rc add left_added}; #left_added
+qx{../src/task rc:local.rc add left_added}; #left_added
 sleep(1);
-qx{../task rc:local.rc 1 prio:H};       #left_modified
+qx{../src/task rc:local.rc 1 prio:H};       #left_modified
 sleep(1);
-qx{../task rc:local.rc 3 +stay};        #left_newer
+qx{../src/task rc:local.rc 3 +stay};        #left_newer
 sleep(1);
-qx{../task rc:local.rc 4 project:test}; #right_newer
+qx{../src/task rc:local.rc 4 project:test}; #right_newer
 sleep(1);
-qx{../task rc:local.rc 6 +delete};      #right_deleted
+qx{../src/task rc:local.rc 6 +delete};      #right_deleted
 sleep(1);
 
 # make remote modifications
-qx{../task rc:remote.rc add right_added};    #right_added
+qx{../src/task rc:remote.rc add right_added};    #right_added
 sleep(1);
-qx{../task rc:remote.rc 2 prio:L};           #right_modified
+qx{../src/task rc:remote.rc 2 prio:L};           #right_modified
 sleep(1);
-qx{../task rc:remote.rc 2 wait:tomorrow};    #right_modified
+qx{../src/task rc:remote.rc 2 wait:tomorrow};    #right_modified
 sleep(1);
-qx{../task rc:remote.rc 4 proj:realProject}; #right_newer
+qx{../src/task rc:remote.rc 4 proj:realProject}; #right_newer
 sleep(1);
-qx{../task rc:remote.rc 5 project:deletion}; #left_deleted
+qx{../src/task rc:remote.rc 5 project:deletion}; #left_deleted
 sleep(1);
-qx{../task rc:remote.rc done 8};             #right_completed
+qx{../src/task rc:remote.rc done 8};             #right_completed
 sleep(1);
-qx{../task rc:remote.rc del 6};              #right_deleted
+qx{../src/task rc:remote.rc del 6};              #right_deleted
 sleep(1);
-qx{../task rc:remote.rc done 3};             #left_newer
+qx{../src/task rc:remote.rc done 3};             #left_newer
 sleep(1);
 
 # make new local modifications
-qx{../task rc:local.rc start 3};         #left_newer
+qx{../src/task rc:local.rc start 3};         #left_newer
 sleep(1);
-qx{../task rc:local.rc 4 +car};          #right_newer
+qx{../src/task rc:local.rc 4 +car};          #right_newer
 sleep(1);
-qx{../task rc:local.rc done 7};          #left_completed
+qx{../src/task rc:local.rc done 7};          #left_completed
 sleep(1);
-qx{../task rc:local.rc del 5};           #left_deleted
+qx{../src/task rc:local.rc del 5};           #left_deleted
 sleep(1);
 
 # make new remote modifications
-qx{../task rc:remote.rc 4 +gym};         # right_newer
+qx{../src/task rc:remote.rc 4 +gym};         # right_newer
 
 # merge remote into local
 copy("local/undo.data", "local/undo.save") or fail("copy local/undo.data to local/undo.save");
-my $output_l = qx{../task rc:local.rc merge remote/};
+my $output_l = qx{../src/task rc:local.rc merge remote/};
 
 #check output
 unlike ($output_l,   qr/Missing/,              "local-merge: no missing entry");
 unlike ($output_l,   qr/Not adding duplicate/, "local-merge: no duplicates");
 
 # merge local into remote
-my $output_r = qx{../task rc:remote.rc merge local/undo.save};
+my $output_r = qx{../src/task rc:remote.rc merge local/undo.save};
 
 # check output
 unlike ($output_r,   qr/Missing/,              "remote-merge: no missing entry");
 unlike ($output_r,   qr/Not adding duplicate/, "remote-merge: no duplicates");
 
 # check reports
-my $report_l = qx{../task rc:local.rc};
-my $report_r = qx{../task rc:remote.rc};
+my $report_l = qx{../src/task rc:local.rc};
+my $report_r = qx{../src/task rc:remote.rc};
 
 # local-merge
 like   ($report_l,   qr/left_added/,       "local-merge: left_added is present");
@@ -161,13 +161,13 @@ like   ($report_l,   qr/H.*left_modified/, "local-merge: left_modified ok");
 like   ($report_l,   qr/\*.*left_newer.*stay/, "local-merge: left_newer ok");
 like   ($report_l,   qr/realProject.*right_newer.*gym/, "local-merge: right_newer ok");
 
-$report_l = qx{../task rc:local.rc export.csv};
+$report_l = qx{../src/task rc:local.rc export.csv};
 like   ($report_l,   qr/deleted.*left_deleted/,      "local-merge: left_deleted ok");
 like   ($report_l,   qr/deleted.*right_deleted/,     "local-merge: right_deleted ok");
 like   ($report_l,   qr/completed.*left_completed/,  "local-merge: left_completed ok");
 like   ($report_l,   qr/completed.*right_completed/,  "local-merge: right_completed ok");
 
-$report_l = qx(../task rc:local.rc waiting);
+$report_l = qx(../src/task rc:local.rc waiting);
 like   ($report_l,   qr/L.*right_modified/, "local-merge: right_modified ok");
 
 # remote-merge
@@ -177,13 +177,13 @@ like   ($report_r,   qr/H.*left_modified/, "remote-merge: left_modified ok");
 like   ($report_r,   qr/\*.*left_newer.*stay/, "remote-merge: left_newer ok");
 like   ($report_r,   qr/realProject.*right_newer.*gym/, "remote-merge: right_newer ok");
 
-$report_r = qx{../task rc:remote.rc export.csv};
+$report_r = qx{../src/task rc:remote.rc export.csv};
 like   ($report_r,   qr/deleted.*left_deleted/,      "remote-merge: left_deleted ok");
 like   ($report_r,   qr/deleted.*right_deleted/,     "remote-merge: right_deleted ok");
 like   ($report_r,   qr/completed.*left_completed/,  "remote-merge: left_completed ok");
 like   ($report_r,   qr/completed.*right_completed/,  "remote-merge: right_completed ok");
 
-$report_r = qx(../task rc:remote.rc waiting);
+$report_r = qx(../src/task rc:remote.rc waiting);
 like   ($report_r,   qr/L.*right_modified/, "remote-merge: right_modified ok");
 
 # check timestamps in undo.data
diff --git a/test/nag.t b/test/nag.t
index 146d23499..5d8321eba 100755
--- a/test/nag.t
+++ b/test/nag.t
@@ -39,20 +39,20 @@ if (open my $fh, '>', 'nag.rc')
   ok (-r 'nag.rc', 'Created nag.rc');
 }
 
-my $setup = "../task rc:nag.rc add due:yesterday one;"
-          . "../task rc:nag.rc add due:tomorrow two;"
-          . "../task rc:nag.rc add priority:H three;"
-          . "../task rc:nag.rc add priority:M four;"
-          . "../task rc:nag.rc add priority:L five;"
-          . "../task rc:nag.rc add six;";
+my $setup = "../src/task rc:nag.rc add due:yesterday one;"
+          . "../src/task rc:nag.rc add due:tomorrow two;"
+          . "../src/task rc:nag.rc add priority:H three;"
+          . "../src/task rc:nag.rc add priority:M four;"
+          . "../src/task rc:nag.rc add priority:L five;"
+          . "../src/task rc:nag.rc add six;";
 qx{$setup};
 
-like   (qx{../task rc:nag.rc do 6}, qr/NAG/, 'do pri: -> nag');
-like   (qx{../task rc:nag.rc do 5}, qr/NAG/, 'do pri:L -> nag');
-like   (qx{../task rc:nag.rc do 4}, qr/NAG/, 'do pri:M-> nag');
-like   (qx{../task rc:nag.rc do 3}, qr/NAG/, 'do pri:H-> nag');
-like   (qx{../task rc:nag.rc do 2}, qr/NAG/, 'do due:tomorrow -> nag');
-unlike (qx{../task rc:nag.rc do 1}, qr/NAG/, 'do due:yesterday -> no nag');
+like   (qx{../src/task rc:nag.rc do 6}, qr/NAG/, 'do pri: -> nag');
+like   (qx{../src/task rc:nag.rc do 5}, qr/NAG/, 'do pri:L -> nag');
+like   (qx{../src/task rc:nag.rc do 4}, qr/NAG/, 'do pri:M-> nag');
+like   (qx{../src/task rc:nag.rc do 3}, qr/NAG/, 'do pri:H-> nag');
+like   (qx{../src/task rc:nag.rc do 2}, qr/NAG/, 'do due:tomorrow -> nag');
+unlike (qx{../src/task rc:nag.rc do 1}, qr/NAG/, 'do due:yesterday -> no nag');
 
 # Cleanup.
 unlink 'pending.data';
diff --git a/test/next.t b/test/next.t
index 77a4af6c1..efefb54bb 100755
--- a/test/next.t
+++ b/test/next.t
@@ -41,12 +41,12 @@ if (open my $fh, '>', 'next.rc')
 
 # Add two tasks for each of two projects, then run next.  There should be only
 # one task from each project shown.
-qx{../task rc:next.rc add project:A priority:H AH};
-qx{../task rc:next.rc add project:A priority:M AM};
-qx{../task rc:next.rc add project:B priority:H BH};
-qx{../task rc:next.rc add project:B Bnone};
+qx{../src/task rc:next.rc add project:A priority:H AH};
+qx{../src/task rc:next.rc add project:A priority:M AM};
+qx{../src/task rc:next.rc add project:B priority:H BH};
+qx{../src/task rc:next.rc add project:B Bnone};
 
-my $output = qx{../task rc:next.rc next};
+my $output = qx{../src/task rc:next.rc next};
 like ($output, qr/\s1\sA\s+H\s+(?:-|\d secs?)\sAH\n/, 'AH shown');
 like ($output, qr/\s3\sB\s+H\s+(?:-|\d secs?)\sBH\n/, 'BH shown');
 
diff --git a/test/oldest.t b/test/oldest.t
index 3b5db3394..4dad1aa45 100755
--- a/test/oldest.t
+++ b/test/oldest.t
@@ -39,43 +39,43 @@ if (open my $fh, '>', 'oldest.rc')
 }
 
 # Add 11 tasks.  Oldest should show 1-10, newest should show 2-11.
-qx{../task rc:oldest.rc add one};
+qx{../src/task rc:oldest.rc add one};
 diag ("3 second delay");
 sleep 1;
-qx{../task rc:oldest.rc add two};
+qx{../src/task rc:oldest.rc add two};
 sleep 1;
-qx{../task rc:oldest.rc add three};
+qx{../src/task rc:oldest.rc add three};
 sleep 1;
-my $output = qx{../task rc:oldest.rc oldest};
+my $output = qx{../src/task rc:oldest.rc oldest};
 like ($output, qr/one/,               'oldest: one');
 like ($output, qr/two/,               'oldest: two');
 like ($output, qr/three/,             'oldest: three');
 like ($output, qr/one.*two.*three/ms, 'oldest: sort');
 
-$output = qx{../task rc:oldest.rc newest};
+$output = qx{../src/task rc:oldest.rc newest};
 like ($output, qr/three/,             'newest: three');
 like ($output, qr/two/,               'newest: two');
 like ($output, qr/one/,               'newest: one');
 like ($output, qr/three.*two.*one/ms, 'newest: sort');
 
-qx{../task rc:oldest.rc add four};
+qx{../src/task rc:oldest.rc add four};
 diag ("7 second delay");
 sleep 1;
-qx{../task rc:oldest.rc add five};
+qx{../src/task rc:oldest.rc add five};
 sleep 1;
-qx{../task rc:oldest.rc add six};
+qx{../src/task rc:oldest.rc add six};
 sleep 1;
-qx{../task rc:oldest.rc add seven};
+qx{../src/task rc:oldest.rc add seven};
 sleep 1;
-qx{../task rc:oldest.rc add eight};
+qx{../src/task rc:oldest.rc add eight};
 sleep 1;
-qx{../task rc:oldest.rc add nine};
+qx{../src/task rc:oldest.rc add nine};
 sleep 1;
-qx{../task rc:oldest.rc add ten};
+qx{../src/task rc:oldest.rc add ten};
 sleep 1;
-qx{../task rc:oldest.rc add eleven};
+qx{../src/task rc:oldest.rc add eleven};
 
-$output = qx{../task rc:oldest.rc oldest};
+$output = qx{../src/task rc:oldest.rc oldest};
 like   ($output, qr/one/,    'oldest: one');
 like   ($output, qr/two/,    'oldest: two');
 like   ($output, qr/three/,  'oldest: three');
@@ -88,7 +88,7 @@ like   ($output, qr/nine/,   'oldest: nine');
 like   ($output, qr/ten/,    'oldest: ten');
 unlike ($output, qr/eleven/, 'no: eleven');
 
-$output = qx{../task rc:oldest.rc oldest limit:3};
+$output = qx{../src/task rc:oldest.rc oldest limit:3};
 like   ($output, qr/one/,    'oldest: one');
 like   ($output, qr/two/,    'oldest: two');
 like   ($output, qr/three/,  'oldest: three');
@@ -101,7 +101,7 @@ unlike ($output, qr/nine/,   'no: nine');
 unlike ($output, qr/ten/,    'no: ten');
 unlike ($output, qr/eleven/, 'no: eleven');
 
-$output = qx{../task rc:oldest.rc newest};
+$output = qx{../src/task rc:oldest.rc newest};
 unlike ($output, qr/one/,    'no: one');
 like   ($output, qr/two/,    'newest: two');
 like   ($output, qr/three/,  'newest: three');
@@ -114,7 +114,7 @@ like   ($output, qr/nine/,   'newest: nine');
 like   ($output, qr/ten/,    'newest: ten');
 like   ($output, qr/eleven/, 'newest: eleven');
 
-$output = qx{../task rc:oldest.rc newest limit:3};
+$output = qx{../src/task rc:oldest.rc newest limit:3};
 unlike ($output, qr/one/,    'no: one');
 unlike ($output, qr/two/,    'no: two');
 unlike ($output, qr/three/,  'no: three');
diff --git a/test/overdue.t b/test/overdue.t
index 557af4311..b01269d9c 100755
--- a/test/overdue.t
+++ b/test/overdue.t
@@ -41,10 +41,10 @@ if (open my $fh, '>', 'due.rc')
 
 # Add an overdue task, a due task, and a regular task.  The "overdue" report
 # should list only the one task.
-qx{../task rc:due.rc add due:yesterday one};
-qx{../task rc:due.rc add due:tomorrow two};
-qx{../task rc:due.rc add due:eoy three};
-my $output = qx{../task rc:due.rc overdue};
+qx{../src/task rc:due.rc add due:yesterday one};
+qx{../src/task rc:due.rc add due:tomorrow two};
+qx{../src/task rc:due.rc add due:eoy three};
+my $output = qx{../src/task rc:due.rc overdue};
 like   ($output, qr/one/,   'overdue: task 1 shows up');
 unlike ($output, qr/two/,   'overdue: task 2 does not show up');
 unlike ($output, qr/three/, 'overdue: task 3 does not show up');
diff --git a/test/override.t b/test/override.t
index 38feba2ea..eeac4c887 100755
--- a/test/override.t
+++ b/test/override.t
@@ -45,9 +45,9 @@ if (open my $fh, '>', 'or.rc')
 
 # The zzz report is defined with an override in the filter that contradicts
 # the value in the rc.  The filter override should prevail.
-qx{../task rc:or.rc add ONE};
-qx{../task rc:or.rc 1 annotate TWO};
-my $output = qx{../task rc:or.rc zzz};
+qx{../src/task rc:or.rc add ONE};
+qx{../src/task rc:or.rc 1 annotate TWO};
+my $output = qx{../src/task rc:or.rc zzz};
 like ($output, qr/ONE.+TWO/ms, 'filter override > rc setting');
 
 # Cleanup.
diff --git a/test/prepend.t b/test/prepend.t
index f582e1fed..f14f862db 100755
--- a/test/prepend.t
+++ b/test/prepend.t
@@ -39,9 +39,9 @@ if (open my $fh, '>', 'prepend.rc')
 }
 
 # Add a task, then prepend more decsription.
-qx{../task rc:prepend.rc add bar};
-qx{../task rc:prepend.rc 1 prepend foo};
-my $output = qx{../task rc:prepend.rc info 1};
+qx{../src/task rc:prepend.rc add bar};
+qx{../src/task rc:prepend.rc 1 prepend foo};
+my $output = qx{../src/task rc:prepend.rc info 1};
 like ($output, qr/Description\s+foo\sbar\n/, 'prepend worked');
 
 # Cleanup.
diff --git a/test/pri_sort.t b/test/pri_sort.t
index b39d32094..a0d9c2f6f 100755
--- a/test/pri_sort.t
+++ b/test/pri_sort.t
@@ -39,54 +39,54 @@ if (open my $fh, '>', 'pri.rc')
 }
 
 # Verify that priorities can be select with the 'over' and 'under' modifiers.
-qx{../task rc:pri.rc add H pri:H};
-qx{../task rc:pri.rc add M pri:M};
-qx{../task rc:pri.rc add L pri:L};
-qx{../task rc:pri.rc add _};
+qx{../src/task rc:pri.rc add H pri:H};
+qx{../src/task rc:pri.rc add M pri:M};
+qx{../src/task rc:pri.rc add L pri:L};
+qx{../src/task rc:pri.rc add _};
 
-my $output = qx{../task rc:pri.rc ls priority.under:H};
+my $output = qx{../src/task rc:pri.rc ls priority.under:H};
 unlike ($output, qr/H/, 'pri H !< H');
   like ($output, qr/M/, 'pri M < H');
   like ($output, qr/L/, 'pri L < H');
   like ($output, qr/_/, 'pri _ < H');
 
-$output = qx{../task rc:pri.rc ls priority.under:M};
+$output = qx{../src/task rc:pri.rc ls priority.under:M};
 unlike ($output, qr/H/, 'pri H !< M');
 unlike ($output, qr/M/, 'pri M !< M');
   like ($output, qr/L/, 'pri L < M');
   like ($output, qr/_/, 'pri _ < M');
 
-$output = qx{../task rc:pri.rc ls priority.under:L};
+$output = qx{../src/task rc:pri.rc ls priority.under:L};
 unlike ($output, qr/H/, 'pri H !< L');
 unlike ($output, qr/M/, 'pri M !< L');
 unlike ($output, qr/L/, 'pri L !< L');
   like ($output, qr/_/, 'pri _ < L');
 
-$output = qx{../task rc:pri.rc ls priority.under:};
+$output = qx{../src/task rc:pri.rc ls priority.under:};
 unlike ($output, qr/H/, 'pri H !< _');
 unlike ($output, qr/M/, 'pri M !< _');
 unlike ($output, qr/L/, 'pri L !< _');
 unlike ($output, qr/_/, 'pri _ !< _');
 
-$output = qx{../task rc:pri.rc ls priority.over:H};
+$output = qx{../src/task rc:pri.rc ls priority.over:H};
 unlike ($output, qr/H/, 'pri H !> H');
 unlike ($output, qr/M/, 'pri M !> H');
 unlike ($output, qr/L/, 'pri L !> H');
 unlike ($output, qr/_/, 'pri _ !> H');
 
-$output = qx{../task rc:pri.rc ls priority.over:M};
+$output = qx{../src/task rc:pri.rc ls priority.over:M};
   like ($output, qr/H/, 'pri H > M');
 unlike ($output, qr/M/, 'pri M !> M');
 unlike ($output, qr/L/, 'pri L !> M');
 unlike ($output, qr/_/, 'pri _ !> M');
 
-$output = qx{../task rc:pri.rc ls priority.over:L};
+$output = qx{../src/task rc:pri.rc ls priority.over:L};
   like ($output, qr/H/, 'pri H > L');
   like ($output, qr/M/, 'pri M > L');
 unlike ($output, qr/L/, 'pri L !> L');
 unlike ($output, qr/_/, 'pri _ !> L');
 
-$output = qx{../task rc:pri.rc ls priority.over:};
+$output = qx{../src/task rc:pri.rc ls priority.over:};
   like ($output, qr/H/, 'pri H > _');
   like ($output, qr/M/, 'pri M > _');
   like ($output, qr/L/, 'pri L > _');
diff --git a/test/project.t b/test/project.t
index e2b489578..ca00edb2f 100755
--- a/test/project.t
+++ b/test/project.t
@@ -40,25 +40,25 @@ if (open my $fh, '>', 'pro.rc')
 }
 
 # Test the project status numbers.
-my $output = qx{../task rc:pro.rc add one pro:foo};
+my $output = qx{../src/task rc:pro.rc add one pro:foo};
 like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 0% complete \(1 of 1 tasks remaining\)\./, 'add one');
 
-$output = qx{../task rc:pro.rc add two pro:'foo'};
+$output = qx{../src/task rc:pro.rc add two pro:'foo'};
 like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 0% complete \(2 of 2 tasks remaining\)\./, 'add two');
 
-$output = qx{../task rc:pro.rc add three pro:'foo'};
+$output = qx{../src/task rc:pro.rc add three pro:'foo'};
 like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 0% complete \(3 of 3 tasks remaining\)\./, 'add three');
 
-$output = qx{../task rc:pro.rc add four pro:'foo'};
+$output = qx{../src/task rc:pro.rc add four pro:'foo'};
 like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 0% complete \(4 of 4 tasks remaining\)\./, 'add four');
 
-$output = qx{../task rc:pro.rc 1 done};
+$output = qx{../src/task rc:pro.rc 1 done};
 like ($output, qr/Project 'foo' is 25% complete \(3 of 4 tasks remaining\)\./, 'done one');
 
-$output = qx{../task rc:pro.rc 2 delete};
+$output = qx{../src/task rc:pro.rc 2 delete};
 like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 33% complete \(2 of 3 tasks remaining\)\./, 'delete two');
 
-$output = qx{../task rc:pro.rc 3 pro:bar};
+$output = qx{../src/task rc:pro.rc 3 pro:bar};
 like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 50% complete \(1 of 2 tasks remaining\)\./, 'change project');
 like ($output, qr/The project 'bar' has changed\.  Project 'bar' is 0% complete \(1 of 1 tasks remaining\)\./, 'change project');
 
diff --git a/test/rc.override.t b/test/rc.override.t
index e26a12f4c..1d03ad0ef 100755
--- a/test/rc.override.t
+++ b/test/rc.override.t
@@ -39,10 +39,10 @@ if (open my $fh, '>', 'rc.rc')
   ok (-r 'rc.rc', 'Created rc.rc');
 }
 
-my $output = qx{../task rc:rc.rc show};
+my $output = qx{../src/task rc:rc.rc show};
 like ($output, qr/\sfoo\s+bar/, 'unmodified');
 
-$output = qx{../task rc:rc.rc rc.foo:baz show};
+$output = qx{../src/task rc:rc.rc rc.foo:baz show};
 like ($output, qr/\sfoo\s+baz/, 'overridden');
 
 unlink 'rc.rc';
diff --git a/test/rc.t b/test/rc.t
index 7b4e00535..5a3ddd62f 100755
--- a/test/rc.t
+++ b/test/rc.t
@@ -34,7 +34,7 @@ use Test::More tests => 15;
 # Create the rc file, using rc.name:value.
 unlink 'foo.rc';
 rmtree 'foo', 0, 0;
-qx{echo 'y'|../task rc:foo.rc rc.data.location:foo};
+qx{echo 'y'|../src/task rc:foo.rc rc.data.location:foo};
 
 ok (-r 'foo.rc', 'Created default rc file');
 ok (-d 'foo', 'Created default data directory');
@@ -46,41 +46,41 @@ unlink 'foo.rc';
 ok (!-r 'foo.rc', 'Removed foo.rc');
 
 # Do it all again, with rc.name=value.
-qx{echo 'y'|../task rc:foo.rc rc.data.location:foo};
+qx{echo 'y'|../src/task rc:foo.rc rc.data.location:foo};
 
 ok (-r 'foo.rc', 'Created default rc file');
 ok (-d 'foo', 'Created default data directory');
 
 # Add a setting.
-qx{echo 'y'|../task rc:foo.rc config must_be_unique old};
-my $output = qx{../task rc:foo.rc show};
+qx{echo 'y'|../src/task rc:foo.rc config must_be_unique old};
+my $output = qx{../src/task rc:foo.rc show};
 like ($output, qr/^must_be_unique\s+old/ms, 'config setting a new value');
 
-qx{echo 'y'|../task rc:foo.rc config must_be_unique new};
-$output = qx{../task rc:foo.rc show};
+qx{echo 'y'|../src/task rc:foo.rc config must_be_unique new};
+$output = qx{../src/task rc:foo.rc show};
 like ($output, qr/^must_be_unique\s+new/ms, 'config overwriting an existing value');
 
-qx{echo 'y'|../task rc:foo.rc config must_be_unique ''};
-$output = qx{../task rc:foo.rc show};
+qx{echo 'y'|../src/task rc:foo.rc config must_be_unique ''};
+$output = qx{../src/task rc:foo.rc show};
 like ($output, qr/^must_be_unique/ms, 'config setting a blank value');
 
-qx{echo 'y'|../task rc:foo.rc config must_be_unique};
-$output = qx{../task rc:foo.rc show};
+qx{echo 'y'|../src/task rc:foo.rc config must_be_unique};
+$output = qx{../src/task rc:foo.rc show};
 unlike ($output, qr/^must_be_unique/ms, 'config removing a value');
 
 # 'report.:b' is designed to get past the config command checks for recognized
 # names.
-qx{echo 'y'|../task rc:foo.rc config -- report.:b +c};
-$output = qx{../task rc:foo.rc show};
+qx{echo 'y'|../src/task rc:foo.rc config -- report.:b +c};
+$output = qx{../src/task rc:foo.rc show};
 like ($output, qr/^report\.:b\s+\+c/ms, 'the -- operator is working');
 
 # Make sure the value is accepted if it has multiple words.
-qx{echo 'y'|../task rc:foo.rc config must_be_unique 'one two three'};
-$output = qx{../task rc:foo.rc show};
+qx{echo 'y'|../src/task rc:foo.rc config must_be_unique 'one two three'};
+$output = qx{../src/task rc:foo.rc show};
 like ($output, qr/^must_be_unique\s+one two three/ms, 'config allows multi-word quoted values');
 
-qx{echo 'y'|../task rc:foo.rc config must_be_unique one two three};
-$output = qx{../task rc:foo.rc show};
+qx{echo 'y'|../src/task rc:foo.rc config must_be_unique one two three};
+$output = qx{../src/task rc:foo.rc show};
 like ($output, qr/^must_be_unique\s+one two three/ms, 'config allows multi-word unquoted values');
 
 rmtree 'foo', 0, 0;
diff --git a/test/recur.limit.t b/test/recur.limit.t
index dfbd1ec33..144cb44af 100755
--- a/test/recur.limit.t
+++ b/test/recur.limit.t
@@ -40,12 +40,12 @@ if (open my $fh, '>', 'recur.rc')
 
 # Add a recurring task, then see how many future pending tasks are
 # generated by default, and by overriding rc.recurrence.limit.
-qx{../task rc:recur.rc add ONE due:tomorrow recur:weekly};
-my $output = qx{../task rc:recur.rc long};
+qx{../src/task rc:recur.rc add ONE due:tomorrow recur:weekly};
+my $output = qx{../src/task rc:recur.rc long};
 my @tasks = $output =~ /(ONE)/g;
 is (scalar @tasks, 1, 'recurrence.limit default to 1');
 
-$output = qx{../task rc:recur.rc rc.recurrence.limit:4 long};
+$output = qx{../src/task rc:recur.rc rc.recurrence.limit:4 long};
 @tasks = $output =~ /(ONE)/g;
 is (scalar @tasks, 4, 'recurrence.limit override to 4');
 
diff --git a/test/recur.t b/test/recur.t
index 7b853191e..d04cbba6e 100755
--- a/test/recur.t
+++ b/test/recur.t
@@ -43,14 +43,14 @@ if (open my $fh, '>', 'recur.rc')
 }
 
 # Create a few recurring tasks, and test the sort order of the recur column.
-qx{../task rc:recur.rc add due:tomorrow recur:daily  first};
-qx{../task rc:recur.rc add due:tomorrow recur:weekly second};
-qx{../task rc:recur.rc add due:tomorrow recur:3d     third};
+qx{../src/task rc:recur.rc add due:tomorrow recur:daily  first};
+qx{../src/task rc:recur.rc add due:tomorrow recur:weekly second};
+qx{../src/task rc:recur.rc add due:tomorrow recur:3d     third};
 
-my $output = qx{../task rc:recur.rc asc};
+my $output = qx{../src/task rc:recur.rc asc};
 like ($output, qr/first .* third .* second/msx, 'daily 3d weekly');
 
-$output = qx{../task rc:recur.rc desc};
+$output = qx{../src/task rc:recur.rc desc};
 like ($output, qr/second .* third .* first/msx, 'weekly 3d daily');
 
 # Cleanup.
diff --git a/test/recur.until.t b/test/recur.until.t
index 9c42c34a4..d7d0078cf 100755
--- a/test/recur.until.t
+++ b/test/recur.until.t
@@ -39,17 +39,17 @@ if (open my $fh, '>', 'recur.rc')
 }
 
 # Create a few recurring tasks, and test the sort order of the recur column.
-qx{../task rc:recur.rc add foo due:now recur:2sec until:5sec};
+qx{../src/task rc:recur.rc add foo due:now recur:2sec until:5sec};
 diag ("Sleeping for 6 seconds");
 sleep 6;
-my $output = qx{../task rc:recur.rc list};
+my $output = qx{../src/task rc:recur.rc list};
 like ($output, qr/^\s+1/ms, 'Found 1');
 like ($output, qr/^\s+2/ms, 'Found 2');
 like ($output, qr/^\s+3/ms, 'Found 3');
 like ($output, qr/^\s+4/ms, 'Found 4');
 
-qx{../task rc:recur.rc do $_} for 1..5;
-$output = qx{../task rc:recur.rc list};
+qx{../src/task rc:recur.rc do $_} for 1..5;
+$output = qx{../src/task rc:recur.rc list};
 like ($output, qr/and has been deleted/, 'Parent task deleted');
 
 # Cleanup.
diff --git a/test/recur.weekdays.t b/test/recur.weekdays.t
index 129c170e8..d459a0216 100755
--- a/test/recur.weekdays.t
+++ b/test/recur.weekdays.t
@@ -39,15 +39,15 @@ if (open my $fh, '>', 'recur.rc')
 }
 
 # Create a few recurring tasks, and test the sort order of the recur column.
-qx{../task rc:recur.rc add due:friday recur:weekdays one};
-my $output = qx{../task rc:recur.rc list};
+qx{../src/task rc:recur.rc add due:friday recur:weekdays one};
+my $output = qx{../src/task rc:recur.rc list};
 like ($output, qr/one/, 'recur weekdays');
 
-$output = qx{../task rc:recur.rc info 1};
+$output = qx{../src/task rc:recur.rc info 1};
 like ($output, qr/Recurrence\s+weekdays/, 'task recurs every weekday');
 
-qx{../task rc:recur.rc do 1};
-$output = qx{../task rc:recur.rc list};
+qx{../src/task rc:recur.rc do 1};
+$output = qx{../src/task rc:recur.rc list};
 
 # Cleanup.
 unlink 'pending.data';
diff --git a/test/roundtrip.t b/test/roundtrip.t
index 306676599..1e2a5ed1c 100755
--- a/test/roundtrip.t
+++ b/test/roundtrip.t
@@ -40,18 +40,18 @@ if (open my $fh, '>', 'roundtrip.rc')
 }
 
 # Add two tasks.
-qx{../task rc:roundtrip.rc add priority:H project:A one};
-qx{../task rc:roundtrip.rc add +tag1 +tag2 two};
+qx{../src/task rc:roundtrip.rc add priority:H project:A one};
+qx{../src/task rc:roundtrip.rc add +tag1 +tag2 two};
 
 # trip 1.
-qx{../task rc:roundtrip.rc export.yaml > ./roundtrip.txt};
+qx{../src/task rc:roundtrip.rc export.yaml > ./roundtrip.txt};
 unlink 'pending.data', 'completed.data', 'undo.data';
-qx{../task rc:roundtrip.rc import ./roundtrip.txt};
+qx{../src/task rc:roundtrip.rc import ./roundtrip.txt};
 
 # trip 2.
-qx{../task rc:roundtrip.rc export.yaml > ./roundtrip.txt};
+qx{../src/task rc:roundtrip.rc export.yaml > ./roundtrip.txt};
 unlink 'pending.data', 'completed.data', 'undo.data';
-qx{../task rc:roundtrip.rc import ./roundtrip.txt};
+qx{../src/task rc:roundtrip.rc import ./roundtrip.txt};
 
 # Exammine.
 
@@ -59,7 +59,7 @@ qx{../task rc:roundtrip.rc import ./roundtrip.txt};
 # -- ------- --- -------- ------- --- ----- --------- --- ---- --------- ---------
 #  1 A       H   8/7/2010                               -                one
 #  2             8/7/2010                               -      tag1 tag2 two
-my $output = qx{../task rc:roundtrip.rc long};
+my $output = qx{../src/task rc:roundtrip.rc long};
 like ($output, qr/1.+A.+H.+\d+\/\d+\/\d+.+(?:-|\d+).+one/,       '2 round trips task 1 identical');
 like ($output, qr/2.+\d+\/\d+\/\d+.+(?:-|\d+).+tag1\stag2\stwo/, '2 round trips task 2 identical');
 
diff --git a/test/sequence.t b/test/sequence.t
index 20f3a144e..b86542a71 100755
--- a/test/sequence.t
+++ b/test/sequence.t
@@ -40,81 +40,81 @@ if (open my $fh, '>', 'seq.rc')
 }
 
 # Test sequences in done/undo
-qx{../task rc:seq.rc add one mississippi};
-qx{../task rc:seq.rc add two mississippi};
-qx{../task rc:seq.rc do 1,2};
-my $output = qx{../task rc:seq.rc info 1};
+qx{../src/task rc:seq.rc add one mississippi};
+qx{../src/task rc:seq.rc add two mississippi};
+qx{../src/task rc:seq.rc do 1,2};
+my $output = qx{../src/task rc:seq.rc info 1};
 like ($output, qr/Status\s+Completed/, 'sequence do 1');
-$output = qx{../task rc:seq.rc info 2};
+$output = qx{../src/task rc:seq.rc info 2};
 like ($output, qr/Status\s+Completed/, 'sequence do 2');
-qx{echo 'y'|../task rc:seq.rc undo};
-qx{echo 'y'|../task rc:seq.rc undo};
-$output = qx{../task rc:seq.rc info 1};
+qx{echo 'y'|../src/task rc:seq.rc undo};
+qx{echo 'y'|../src/task rc:seq.rc undo};
+$output = qx{../src/task rc:seq.rc info 1};
 like ($output, qr/Status\s+Pending/, 'sequence undo 1');
-$output = qx{../task rc:seq.rc info 2};
+$output = qx{../src/task rc:seq.rc info 2};
 like ($output, qr/Status\s+Pending/, 'sequence undo 2');
 
 # Test sequences in delete/undelete
-qx{../task rc:seq.rc delete 1,2};
-$output = qx{../task rc:seq.rc info 1};
+qx{../src/task rc:seq.rc delete 1,2};
+$output = qx{../src/task rc:seq.rc info 1};
 like ($output, qr/Status\s+Deleted/, 'sequence delete 1');
-$output = qx{../task rc:seq.rc info 2};
+$output = qx{../src/task rc:seq.rc info 2};
 like ($output, qr/Status\s+Deleted/, 'sequence delete 2');
-qx{echo 'y'|../task rc:seq.rc undo};
-qx{echo 'y'|../task rc:seq.rc undo};
-$output = qx{../task rc:seq.rc info 1};
+qx{echo 'y'|../src/task rc:seq.rc undo};
+qx{echo 'y'|../src/task rc:seq.rc undo};
+$output = qx{../src/task rc:seq.rc info 1};
 like ($output, qr/Status\s+Pending/, 'sequence undo 1');
-$output = qx{../task rc:seq.rc info 2};
+$output = qx{../src/task rc:seq.rc info 2};
 like ($output, qr/Status\s+Pending/, 'sequence undo 2');
 
 # Test sequences in start/stop
-qx{../task rc:seq.rc start 1,2};
-$output = qx{../task rc:seq.rc info 1};
+qx{../src/task rc:seq.rc start 1,2};
+$output = qx{../src/task rc:seq.rc info 1};
 like ($output, qr/Start/, 'sequence start 1');
-$output = qx{../task rc:seq.rc info 2};
+$output = qx{../src/task rc:seq.rc info 2};
 like ($output, qr/Start/, 'sequence start 2');
-qx{../task rc:seq.rc stop 1,2};
-$output = qx{../task rc:seq.rc info 1};
+qx{../src/task rc:seq.rc stop 1,2};
+$output = qx{../src/task rc:seq.rc info 1};
 unlike ($output, qr/Start/, 'sequence stop 1');
-$output = qx{../task rc:seq.rc info 2};
+$output = qx{../src/task rc:seq.rc info 2};
 unlike ($output, qr/Start/, 'sequence stop 2');
 
 # Test sequences in modify
-qx{../task rc:seq.rc 1,2 +tag};
-$output = qx{../task rc:seq.rc info 1};
+qx{../src/task rc:seq.rc 1,2 +tag};
+$output = qx{../src/task rc:seq.rc info 1};
 like ($output, qr/Tags\s+tag/, 'sequence modify 1');
-$output = qx{../task rc:seq.rc info 2};
+$output = qx{../src/task rc:seq.rc info 2};
 like ($output, qr/Tags\s+tag/, 'sequence modify 2');
-qx{../task rc:seq.rc 1,2 -tag};
-$output = qx{../task rc:seq.rc info 1};
+qx{../src/task rc:seq.rc 1,2 -tag};
+$output = qx{../src/task rc:seq.rc info 1};
 unlike ($output, qr/Tags\s+tag/, 'sequence unmodify 1');
-$output = qx{../task rc:seq.rc info 2};
+$output = qx{../src/task rc:seq.rc info 2};
 unlike ($output, qr/Tags\s+tag/, 'sequence unmodify 2');
 
 # Test sequences in substitutions
-qx{../task rc:seq.rc 1,2 /miss/Miss/};
-$output = qx{../task rc:seq.rc info 1};
+qx{../src/task rc:seq.rc 1,2 /miss/Miss/};
+$output = qx{../src/task rc:seq.rc info 1};
 like ($output, qr/Description\s+one Miss/, 'sequence substitution 1');
-$output = qx{../task rc:seq.rc info 2};
+$output = qx{../src/task rc:seq.rc info 2};
 like ($output, qr/Description\s+two Miss/, 'sequence substitution 2');
 
 # Test sequences in info
-$output = qx{../task rc:seq.rc info 1,2};
+$output = qx{../src/task rc:seq.rc info 1,2};
 like ($output, qr/Description\s+one Miss/, 'sequence info 1');
 like ($output, qr/Description\s+two Miss/, 'sequence info 2');
 
 # Test sequences in duplicate
-qx{../task rc:seq.rc duplicate 1,2 pri:H};
-$output = qx{../task rc:seq.rc info 3};
+qx{../src/task rc:seq.rc duplicate 1,2 pri:H};
+$output = qx{../src/task rc:seq.rc info 3};
 like ($output, qr/Priority\s+H/, 'sequence duplicate 1');
-$output = qx{../task rc:seq.rc info 4};
+$output = qx{../src/task rc:seq.rc info 4};
 like ($output, qr/Priority\s+H/, 'sequence duplicate 2');
 
 # Test sequences in annotate
-qx{../task rc:seq.rc annotate 1,2 note};
-$output = qx{../task rc:seq.rc info 1};
+qx{../src/task rc:seq.rc annotate 1,2 note};
+$output = qx{../src/task rc:seq.rc info 1};
 like ($output, qr/\d+\/\d+\/\d+ note/, 'sequence annotate 1');
-$output = qx{../task rc:seq.rc info 2};
+$output = qx{../src/task rc:seq.rc info 2};
 like ($output, qr/\d+\/\d+\/\d+ note/, 'sequence annotate 2');
 
 # Cleanup.
diff --git a/test/shadow.t b/test/shadow.t
index a56894d8e..0a2f2ed0a 100755
--- a/test/shadow.t
+++ b/test/shadow.t
@@ -42,16 +42,16 @@ if (open my $fh, '>', 'shadow.rc')
   ok (-r 'shadow.rc', 'Created shadow.rc');
 }
 
-my $output = qx{../task rc:shadow.rc add one};
+my $output = qx{../src/task rc:shadow.rc add one};
 like ($output, qr/\[Shadow file '\.\/shadow\.txt' updated\.\]/, 'shadow file updated on add');
 
-$output = qx{../task rc:shadow.rc list};
+$output = qx{../src/task rc:shadow.rc list};
 unlike ($output, qr/\[Shadow file '\.\/shadow\.txt' updated\.\]/, 'shadow file not updated on list');
 
-$output = qx{../task rc:shadow.rc delete 1};
+$output = qx{../src/task rc:shadow.rc delete 1};
 like ($output, qr/\[Shadow file '\.\/shadow\.txt' updated\.\]/, 'shadow file updated on delete');
 
-$output = qx{../task rc:shadow.rc list};
+$output = qx{../src/task rc:shadow.rc list};
 unlike ($output, qr/\[Shadow file '\.\/shadow\.txt' updated\.\]/, 'shadow file not updated on list');
 
 # Inspect the shadow file.
diff --git a/test/shell.t b/test/shell.t
index bb4124cf3..ca775b9d9 100755
--- a/test/shell.t
+++ b/test/shell.t
@@ -41,11 +41,11 @@ if (open my $fh, '>', 'shell.rc')
 }
 
 # Test the prompt.
-my $output = qx{echo "\\nquit\\n" | ../task rc:shell.rc shell};
+my $output = qx{echo "\\nquit\\n" | ../src/task rc:shell.rc shell};
 like ($output, qr/testprompt>/, 'custom prompt is being used');
 
 # Test a simple add, then info.
-$output = qx{echo "add foo\ninfo 1\n" | ../task rc:shell.rc shell};
+$output = qx{echo "add foo\ninfo 1\n" | ../src/task rc:shell.rc shell};
 like ($output, qr/Description\s+foo/, 'add/info working');
 
 # Cleanup.
diff --git a/test/sorting.t b/test/sorting.t
index 7957e2288..9632be522 100755
--- a/test/sorting.t
+++ b/test/sorting.t
@@ -40,14 +40,14 @@ if (open my $fh, '>', 'sorting.rc')
 
 # Test assorted sort orders.
 
-qx{../task rc:sorting.rc add                                    zero};
-qx{../task rc:sorting.rc add priority:H project:A due:yesterday one};
-qx{../task rc:sorting.rc add priority:M project:B due:today     two};
-qx{../task rc:sorting.rc add priority:L project:C due:tomorrow  three};
-qx{../task rc:sorting.rc add priority:H project:C due:today     four};
+qx{../src/task rc:sorting.rc add                                    zero};
+qx{../src/task rc:sorting.rc add priority:H project:A due:yesterday one};
+qx{../src/task rc:sorting.rc add priority:M project:B due:today     two};
+qx{../src/task rc:sorting.rc add priority:L project:C due:tomorrow  three};
+qx{../src/task rc:sorting.rc add priority:H project:C due:today     four};
 
-qx{../task rc:sorting.rc start 2};
-qx{../task rc:sorting.rc start 4};
+qx{../src/task rc:sorting.rc start 2};
+qx{../src/task rc:sorting.rc start 4};
 
 # pri:H pro:C   due:today     four
 # pri:H pro:A * due:yesterday one
@@ -177,7 +177,7 @@ my %tests =
 
 for my $sort (sort keys %tests)
 {
-  my $output = qx{../task rc:sorting.rc rc.report.list.sort:${sort} list};
+  my $output = qx{../src/task rc:sorting.rc rc.report.list.sort:${sort} list};
   like ($output, qr/$tests{$sort}/ms, "sort:${sort}");
 }
 
diff --git a/test/special.t b/test/special.t
index 311d134a0..410dd1db4 100755
--- a/test/special.t
+++ b/test/special.t
@@ -45,15 +45,15 @@ if (open my $fh, '>', 'special.rc')
 }
 
 # Prove that +nocolor suppresses all color for a task.
-qx{../task rc:special.rc add should have no red +nocolor priority:H};
-qx{../task rc:special.rc add should be red +nonag};
-my $output = qx{../task rc:special.rc ls};
+qx{../src/task rc:special.rc add should have no red +nocolor priority:H};
+qx{../src/task rc:special.rc add should be red +nonag};
+my $output = qx{../src/task rc:special.rc ls};
 like ($output, qr/\s1\s+H\s+should have no red/,      'no red in first task due to +nocolor');
 like ($output, qr/\033\[31mshould be red\s+\033\[0m/, 'red in second task');
 
 # Prove that +nonag suppresses nagging when a low priority task is completed
 # ahead of a high priority one.
-$output = qx{../task rc:special.rc done 2};
+$output = qx{../src/task rc:special.rc done 2};
 unlike ($output, qr/NAG/, '+nonag suppressed nagging for task 2');
 
 # Cleanup.
diff --git a/test/start.t b/test/start.t
index bd1e5be7b..a0e0daec3 100755
--- a/test/start.t
+++ b/test/start.t
@@ -39,30 +39,30 @@ if (open my $fh, '>', 'start.rc')
 }
 
 # Test the add/start/stop commands.
-qx{../task rc:start.rc add one};
-qx{../task rc:start.rc add two};
-my $output = qx{../task rc:start.rc active};
+qx{../src/task rc:start.rc add one};
+qx{../src/task rc:start.rc add two};
+my $output = qx{../src/task rc:start.rc active};
 unlike ($output, qr/one/, 'one not active');
 unlike ($output, qr/two/, 'two not active');
 
-qx{../task rc:start.rc start 1};
-qx{../task rc:start.rc start 2};
-$output = qx{../task rc:start.rc active};
+qx{../src/task rc:start.rc start 1};
+qx{../src/task rc:start.rc start 2};
+$output = qx{../src/task rc:start.rc active};
 like ($output, qr/one/, 'one active');
 like ($output, qr/two/, 'two active');
 
-qx{../task rc:start.rc stop 1};
-$output = qx{../task rc:start.rc active};
+qx{../src/task rc:start.rc stop 1};
+$output = qx{../src/task rc:start.rc active};
 unlike ($output, qr/one/, 'one not active');
 like   ($output, qr/two/, 'two active');
 
-qx{../task rc:start.rc stop 2};
-$output = qx{../task rc:start.rc active};
+qx{../src/task rc:start.rc stop 2};
+$output = qx{../src/task rc:start.rc active};
 unlike ($output, qr/one/, 'one not active');
 unlike ($output, qr/two/, 'two not active');
 
-qx{../task rc:start.rc done 2};
-$output = qx{../task rc:start.rc list};
+qx{../src/task rc:start.rc done 2};
+$output = qx{../src/task rc:start.rc list};
 unlike ($output, qr/two/, 'two deleted');
 
 # Create the rc file.
@@ -74,12 +74,12 @@ if (open my $fh, '>', 'start2.rc')
   ok (-r 'start2.rc', 'Created start2.rc');
 }
 
-qx{../task rc:start2.rc start 1};
-$output = qx{../task rc:start2.rc list};
+qx{../src/task rc:start2.rc start 1};
+$output = qx{../src/task rc:start2.rc list};
 like ($output, qr/Started task/, 'one start and annotated');
 
-qx{../task rc:start2.rc stop 1};
-$output = qx{../task rc:start2.rc list};
+qx{../src/task rc:start2.rc stop 1};
+$output = qx{../src/task rc:start2.rc list};
 like ($output, qr/Stopped task/, 'one stopped and annotated');
 
 # Create the rc file.
@@ -93,12 +93,12 @@ if (open my $fh, '>', 'start3.rc')
   ok (-r 'start3.rc', 'Created start3.rc');
 }
 
-qx{../task rc:start3.rc start 1};
-$output = qx{../task rc:start3.rc list};
+qx{../src/task rc:start3.rc start 1};
+$output = qx{../src/task rc:start3.rc list};
 like ($output, qr/Nu.+kör.+vi/ms, 'one start and annotated with custom description');
 
-qx{../task rc:start3.rc stop 1};
-$output = qx{../task rc:start3.rc list};
+qx{../src/task rc:start3.rc stop 1};
+$output = qx{../src/task rc:start3.rc list};
 like ($output, qr/Nu.+stannar.+vi/ms, 'one stopped and annotated with custom description');
 
 # Cleanup.
diff --git a/test/subproject.t b/test/subproject.t
index 190b2646b..a92dfd912 100755
--- a/test/subproject.t
+++ b/test/subproject.t
@@ -38,28 +38,28 @@ if (open my $fh, '>', 'sp.rc')
   ok (-r 'sp.rc', 'Created sp.rc');
 }
 
-my $setup = "../task rc:sp.rc add project:abc abc;"
-          . "../task rc:sp.rc add project:ab  ab;"
-          . "../task rc:sp.rc add project:a   a;"
-          . "../task rc:sp.rc add project:b   b;";
+my $setup = "../src/task rc:sp.rc add project:abc abc;"
+          . "../src/task rc:sp.rc add project:ab  ab;"
+          . "../src/task rc:sp.rc add project:a   a;"
+          . "../src/task rc:sp.rc add project:b   b;";
 qx{$setup};
 
-my $output = qx{../task rc:sp.rc list project:b};
+my $output = qx{../src/task rc:sp.rc list project:b};
 like ($output, qr/\bb\s*$/m, 'abc,ab,a,b | b -> b');
 
-$output = qx{../task rc:sp.rc list project:a};
+$output = qx{../src/task rc:sp.rc list project:a};
 like ($output, qr/\babc\s*$/m, 'abc,ab,a,b | a -> abc');
 like ($output, qr/\bab\s*$/m,  'abc,ab,a,b | a -> ab');
 like ($output, qr/\ba\s*$/m,   'abc,ab,a,b | a -> a');
 
-$output = qx{../task rc:sp.rc list project:ab};
+$output = qx{../src/task rc:sp.rc list project:ab};
 like ($output, qr/\babc\s*$/m, 'abc,ab,a,b | a -> abc');
 like ($output, qr/\bab\s*$/m,  'abc,ab,a,b | a -> ab');
 
-$output = qx{../task rc:sp.rc list project:abc};
+$output = qx{../src/task rc:sp.rc list project:abc};
 like ($output, qr/\babc\s*$/m, 'abc,ab,a,b | a -> abc');
 
-$output = qx{../task rc:sp.rc list project:abcd};
+$output = qx{../src/task rc:sp.rc list project:abcd};
 like ($output, qr/No matches./, 'abc,ab,a,b | abcd -> nul');
 
 # Cleanup.
diff --git a/test/substitute.t b/test/substitute.t
index 1b5e274a1..87571983d 100755
--- a/test/substitute.t
+++ b/test/substitute.t
@@ -39,33 +39,33 @@ if (open my $fh, '>', 'subst.rc')
 }
 
 # Test the substitution command.
-qx{../task rc:subst.rc add foo foo foo};
-qx{../task rc:subst.rc 1 /foo/FOO/};
-my $output = qx{../task rc:subst.rc info 1};
+qx{../src/task rc:subst.rc add foo foo foo};
+qx{../src/task rc:subst.rc 1 /foo/FOO/};
+my $output = qx{../src/task rc:subst.rc info 1};
 like ($output, qr/FOO foo foo/, 'substitution in description');
 
-qx{../task rc:subst.rc 1 /foo/FOO/g};
-$output = qx{../task rc:subst.rc info 1};
+qx{../src/task rc:subst.rc 1 /foo/FOO/g};
+$output = qx{../src/task rc:subst.rc info 1};
 like ($output, qr/FOO FOO FOO/, 'global substitution in description');
 
 # Test the substitution command on annotations.
-qx{../task rc:subst.rc annotate 1 bar bar bar};
-qx{../task rc:subst.rc 1 /bar/BAR/};
-$output = qx{../task rc:subst.rc info 1};
+qx{../src/task rc:subst.rc annotate 1 bar bar bar};
+qx{../src/task rc:subst.rc 1 /bar/BAR/};
+$output = qx{../src/task rc:subst.rc info 1};
 like ($output, qr/BAR bar bar/, 'substitution in annotation');
 
-qx{../task rc:subst.rc 1 /bar/BAR/g};
-$output = qx{../task rc:subst.rc info 1};
+qx{../src/task rc:subst.rc 1 /bar/BAR/g};
+$output = qx{../src/task rc:subst.rc info 1};
 like ($output, qr/BAR BAR BAR/, 'global substitution in annotation');
 
-qx{../task rc:subst.rc 1 /FOO/aaa/};
-qx{../task rc:subst.rc 1 /FOO/bbb/};
-qx{../task rc:subst.rc 1 /FOO/ccc/};
-$output = qx{../task rc:subst.rc info 1};
+qx{../src/task rc:subst.rc 1 /FOO/aaa/};
+qx{../src/task rc:subst.rc 1 /FOO/bbb/};
+qx{../src/task rc:subst.rc 1 /FOO/ccc/};
+$output = qx{../src/task rc:subst.rc info 1};
 like ($output, qr/aaa bbb ccc/, 'individual successive substitution in description');
 
-qx{../task rc:subst.rc 1 /bbb//};
-$output = qx{../task rc:subst.rc info 1};
+qx{../src/task rc:subst.rc 1 /bbb//};
+$output = qx{../src/task rc:subst.rc info 1};
 like ($output, qr/aaa  ccc/, 'word deletion in description');
 
 # Cleanup.
diff --git a/test/tag.t b/test/tag.t
index 8ed313d66..19ec9efed 100755
--- a/test/tag.t
+++ b/test/tag.t
@@ -39,27 +39,27 @@ if (open my $fh, '>', 'tag.rc')
 }
 
 # Add task with tags.
-my $output = qx{../task rc:tag.rc add +one This +two is a test +three; ../task rc:tag.rc info 1};
+my $output = qx{../src/task rc:tag.rc add +one This +two is a test +three; ../src/task rc:tag.rc info 1};
 like ($output, qr/^Tags\s+one two three\n/m, 'tags found');
 
 # Remove tags.
-$output = qx{../task rc:tag.rc 1 -three -two -one; ../task rc:tag.rc info 1};
+$output = qx{../src/task rc:tag.rc 1 -three -two -one; ../src/task rc:tag.rc info 1};
 unlike ($output, qr/^Tags/m, '-three -two -one tag removed');
 
 # Add tags.
-$output = qx{../task rc:tag.rc 1 +four +five +six; ../task rc:tag.rc info 1};
+$output = qx{../src/task rc:tag.rc 1 +four +five +six; ../src/task rc:tag.rc info 1};
 like ($output, qr/^Tags\s+four five six\n/m, 'tags found');
 
 # Remove tags.
-$output = qx{../task rc:tag.rc 1 -four -five -six; ../task rc:tag.rc info 1};
+$output = qx{../src/task rc:tag.rc 1 -four -five -six; ../src/task rc:tag.rc info 1};
 unlike ($output, qr/^Tags/m, '-four -five -six tag removed');
 
 # Add and remove tags.
-$output = qx{../task rc:tag.rc 1 +duplicate -duplicate; ../task rc:tag.rc info 1};
+$output = qx{../src/task rc:tag.rc 1 +duplicate -duplicate; ../src/task rc:tag.rc info 1};
 unlike ($output, qr/^Tags/m, '+duplicate -duplicate NOP');
 
 # Remove missing tag.
-$output = qx{../task rc:tag.rc 1 -missing; ../task rc:tag.rc info 1};
+$output = qx{../src/task rc:tag.rc 1 -missing; ../src/task rc:tag.rc info 1};
 unlike ($output, qr/^Tags/m, '-missing NOP');
 
 # Cleanup.
diff --git a/test/timesheet.t b/test/timesheet.t
index c772678af..82d8c6b89 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -72,13 +72,13 @@ EOF
   ok (-r 'pending.data', 'Created pending.data');
 }
 
-my $output = qx{../task rc:time.rc timesheet};
+my $output = qx{../src/task rc:time.rc timesheet};
 like ($output, qr/Completed.+C0.+Started.+PS0/ms, 'one week of started and completed');
 
-$output = qx{../task rc:time.rc timesheet 2};
+$output = qx{../src/task rc:time.rc timesheet 2};
 like ($output, qr/Completed.+C0.+Started.+PS0.+Completed.+C1.+Started.+PS1/ms, 'two weeks of started and completed');
 
-$output = qx{../task rc:time.rc timesheet 3};
+$output = qx{../src/task rc:time.rc timesheet 3};
 like ($output, qr/Completed.+C0.+Started.+PS0.+Completed.+C1.+Started.+PS1.+Completed.+C2.+Started.+PS2/ms, 'three weeks of started and completed');
 
 # Cleanup.
diff --git a/test/undo.t b/test/undo.t
index 17812129c..075f44031 100755
--- a/test/undo.t
+++ b/test/undo.t
@@ -40,19 +40,19 @@ if (open my $fh, '>', 'undo.rc')
 }
 
 # Test the add/do/undo commands.
-my $output = qx{../task rc:undo.rc add one; ../task rc:undo.rc info 1};
+my $output = qx{../src/task rc:undo.rc add one; ../src/task rc:undo.rc info 1};
 ok (-r 'pending.data', 'pending.data created');
 like ($output, qr/Status\s+Pending\n/, 'Pending');
 
-$output = qx{../task rc:undo.rc do 1; ../task rc:undo.rc info 1};
+$output = qx{../src/task rc:undo.rc do 1; ../src/task rc:undo.rc info 1};
 ok (-r 'completed.data', 'completed.data created');
 like ($output, qr/Status\s+Completed\n/, 'Completed');
 
-$output = qx{echo 'y'|../task rc:undo.rc undo; ../task rc:undo.rc info 1};
+$output = qx{echo 'y'|../src/task rc:undo.rc undo; ../src/task rc:undo.rc info 1};
 ok (-r 'completed.data', 'completed.data created');
 like ($output, qr/Status\s+Pending\n/, 'Pending');
 
-$output = qx{../task rc:undo.rc do 1; ../task rc:undo.rc list};
+$output = qx{../src/task rc:undo.rc do 1; ../src/task rc:undo.rc list};
 like ($output, qr/No matches/, 'No matches');
 
 # Cleanup.
diff --git a/test/urgency.t b/test/urgency.t
index b2af63ba6..9752d547e 100755
--- a/test/urgency.t
+++ b/test/urgency.t
@@ -56,116 +56,116 @@ if (open my $fh, '>', 'urgency.rc')
 # calculated.
 
 # priority
-qx{../task rc:urgency.rc add control};                   # 1
-qx{../task rc:urgency.rc add 1a pri:H};                  # 2
-qx{../task rc:urgency.rc add 1b pri:M};                  # 3
-qx{../task rc:urgency.rc add 1c pri:L};                  # 4
+qx{../src/task rc:urgency.rc add control};                   # 1
+qx{../src/task rc:urgency.rc add 1a pri:H};                  # 2
+qx{../src/task rc:urgency.rc add 1b pri:M};                  # 3
+qx{../src/task rc:urgency.rc add 1c pri:L};                  # 4
 
 # priority: 10 (pending) + 10 (unblocked)
-my $output = qx{../task rc:urgency.rc 1 _urgency};
+my $output = qx{../src/task rc:urgency.rc 1 _urgency};
 like ($output, qr/urgency 20$/ms, 'Control = 20');
 
 # priority: 10 (pri:H) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 2 _urgency};
+$output = qx{../src/task rc:urgency.rc 2 _urgency};
 like ($output, qr/urgency 30$/ms, 'pri:H = 30');
 
 # priority: 6.5 (pri:M) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 3 _urgency};
+$output = qx{../src/task rc:urgency.rc 3 _urgency};
 like ($output, qr/urgency 26\.5$/ms, 'pri:M = 26.5');
 
 # priority: 3 (pri:L) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 4 _urgency};
+$output = qx{../src/task rc:urgency.rc 4 _urgency};
 like ($output, qr/urgency 23$/ms, 'pri:L = 23');
 
 # project: 10 (project) + 10 (pending) + 10 (unblocked)
-qx{../task rc:urgency.rc add 2a project:P};              # 5
-$output = qx{../task rc:urgency.rc 5 _urgency};
+qx{../src/task rc:urgency.rc add 2a project:P};              # 5
+$output = qx{../src/task rc:urgency.rc 5 _urgency};
 like ($output, qr/urgency 30$/ms, 'pro:P = 30');
 
 # active: 10 (active) + 10 (pending) + 10 (unblocked)
-qx{../task rc:urgency.rc add 3a};                        # 6
-qx{../task rc:urgency.rc 6 start};
-$output = qx{../task rc:urgency.rc 6 _urgency};
+qx{../src/task rc:urgency.rc add 3a};                        # 6
+qx{../src/task rc:urgency.rc 6 start};
+$output = qx{../src/task rc:urgency.rc 6 _urgency};
 like ($output, qr/urgency 30$/ms, 'active = 30');
 
 # next: 10 (+next) + 8 (1 tag) + 10 (pending) + 10 (unblocked)
-qx{../task rc:urgency.rc add 4a +next};                  # 7
-$output = qx{../task rc:urgency.rc 7 _urgency};
+qx{../src/task rc:urgency.rc add 4a +next};                  # 7
+$output = qx{../src/task rc:urgency.rc 7 _urgency};
 like ($output, qr/urgency 38$/ms, '+next = 38');
 
 # tags
-qx{../task rc:urgency.rc add 5a +one};                   # 8
-qx{../task rc:urgency.rc add 5b +one +two};              # 9
-qx{../task rc:urgency.rc add 5c +one +two +three};       # 10
-qx{../task rc:urgency.rc add 5d +one +two +three +four}; # 11
+qx{../src/task rc:urgency.rc add 5a +one};                   # 8
+qx{../src/task rc:urgency.rc add 5b +one +two};              # 9
+qx{../src/task rc:urgency.rc add 5c +one +two +three};       # 10
+qx{../src/task rc:urgency.rc add 5d +one +two +three +four}; # 11
 
 # tags: 8 (1 tag) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 8 _urgency};
+$output = qx{../src/task rc:urgency.rc 8 _urgency};
 like ($output, qr/urgency 28$/ms, '+one = 28');
 
 # tags: 9 (2 tags) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 9 _urgency};
+$output = qx{../src/task rc:urgency.rc 9 _urgency};
 like ($output, qr/urgency 29$/ms, '+one +two = 29');
 
 # tags: 10 (3 tags) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 10 _urgency};
+$output = qx{../src/task rc:urgency.rc 10 _urgency};
 like ($output, qr/urgency 30$/ms, '+one +two +three = 30');
 
 # tags: 10 (4 tags) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 10 _urgency};
+$output = qx{../src/task rc:urgency.rc 10 _urgency};
 like ($output, qr/urgency 30$/ms, '+one +two +three +four = 30');
 
 # annotations
-qx{../task rc:urgency.rc add 6a};                        # 12
-qx{../task rc:urgency.rc 12 annotate A};
-qx{../task rc:urgency.rc add 6b};                        # 13
-qx{../task rc:urgency.rc 13 annotate A};
+qx{../src/task rc:urgency.rc add 6a};                        # 12
+qx{../src/task rc:urgency.rc 12 annotate A};
+qx{../src/task rc:urgency.rc add 6b};                        # 13
+qx{../src/task rc:urgency.rc 13 annotate A};
 diag ("6 second delay");
 sleep 1;
-qx{../task rc:urgency.rc 13 annotate B};
-qx{../task rc:urgency.rc add 6c};                        # 14
-qx{../task rc:urgency.rc 14 annotate A};
+qx{../src/task rc:urgency.rc 13 annotate B};
+qx{../src/task rc:urgency.rc add 6c};                        # 14
+qx{../src/task rc:urgency.rc 14 annotate A};
 sleep 1;
-qx{../task rc:urgency.rc 14 annotate B};
+qx{../src/task rc:urgency.rc 14 annotate B};
 sleep 1;
-qx{../task rc:urgency.rc 14 annotate C};
-qx{../task rc:urgency.rc add 6d};                        # 15
-qx{../task rc:urgency.rc 15 annotate A};
+qx{../src/task rc:urgency.rc 14 annotate C};
+qx{../src/task rc:urgency.rc add 6d};                        # 15
+qx{../src/task rc:urgency.rc 15 annotate A};
 sleep 1;
-qx{../task rc:urgency.rc 15 annotate B};
+qx{../src/task rc:urgency.rc 15 annotate B};
 sleep 1;
-qx{../task rc:urgency.rc 15 annotate C};
+qx{../src/task rc:urgency.rc 15 annotate C};
 sleep 1;
-qx{../task rc:urgency.rc 15 annotate D};
+qx{../src/task rc:urgency.rc 15 annotate D};
 
 # annotations: 8 (1 annotation) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 12 _urgency};
+$output = qx{../src/task rc:urgency.rc 12 _urgency};
 like ($output, qr/urgency 28$/ms, '1 annotation = 28');
 
 # annotations: 9 (2 annotations) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 13 _urgency};
+$output = qx{../src/task rc:urgency.rc 13 _urgency};
 like ($output, qr/urgency 29$/ms, '2 annotations = 29');
 
 # annotations: 10 (3 annotations) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 14 _urgency};
+$output = qx{../src/task rc:urgency.rc 14 _urgency};
 like ($output, qr/urgency 30$/ms, '3 annotations = 30');
 
 # annotations: 10 (4 annotations) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 15 _urgency};
+$output = qx{../src/task rc:urgency.rc 15 _urgency};
 like ($output, qr/urgency 30$/ms, '4 annotations = 30');
 
 # waiting: 10 (unblocked)
-qx{../task rc:urgency.rc add 7a wait:10s};               # 16
-$output = qx{../task rc:urgency.rc 16 _urgency};
+qx{../src/task rc:urgency.rc add 7a wait:10s};               # 16
+$output = qx{../src/task rc:urgency.rc 16 _urgency};
 like ($output, qr/urgency 10$/ms, 'waiting = 10');
 
 # blocked: 10 (pending)
-qx{../task rc:urgency.rc add 8a depends:1};              # 17
-$output = qx{../task rc:urgency.rc 17 _urgency};
+qx{../src/task rc:urgency.rc add 8a depends:1};              # 17
+$output = qx{../src/task rc:urgency.rc 17 _urgency};
 like ($output, qr/urgency 10$/ms, 'blocked = 10');
 
 # blocking: 10 (blocking) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 1 _urgency};
+$output = qx{../src/task rc:urgency.rc 1 _urgency};
 like ($output, qr/urgency 30$/ms, 'blocking = 30');
 
 # due
@@ -176,135 +176,135 @@ like ($output, qr/urgency 30$/ms, 'blocking = 30');
 #  has due date                  ->  0.3
 #  no due date                   ->  0.0
 
-qx{../task rc:urgency.rc add 9a due:-10d};               # 18
-qx{../task rc:urgency.rc add 9b due:-7d};                # 19
-qx{../task rc:urgency.rc add 9c due:-6d};                # 20
-qx{../task rc:urgency.rc add 9d due:-5d};                # 21
-qx{../task rc:urgency.rc add 9e due:-4d};                # 22
-qx{../task rc:urgency.rc add 9f due:-3d};                # 23
-qx{../task rc:urgency.rc add 9g due:-2d};                # 24
-qx{../task rc:urgency.rc add 9h due:-1d};                # 25
-qx{../task rc:urgency.rc add 9i due:now};                # 26
-qx{../task rc:urgency.rc add 9j due:25h};                # 27
-qx{../task rc:urgency.rc add 9k due:49h};                # 28
-qx{../task rc:urgency.rc add 9l due:73h};                # 29
-qx{../task rc:urgency.rc add 9m due:97h};                # 30
-qx{../task rc:urgency.rc add 9n due:121h};               # 31
-qx{../task rc:urgency.rc add 9o due:145h};               # 32
-qx{../task rc:urgency.rc add 9p due:169h};               # 33
-qx{../task rc:urgency.rc add 9q due:193h};               # 34
-qx{../task rc:urgency.rc add 9r due:217h};               # 35
-qx{../task rc:urgency.rc add 9s due:241h};               # 36
-qx{../task rc:urgency.rc add 9t due:265h};               # 37
-qx{../task rc:urgency.rc add 9u due:289h};               # 38
-qx{../task rc:urgency.rc add 9v due:313h};               # 39
-qx{../task rc:urgency.rc add 9w due:337h};               # 40
-qx{../task rc:urgency.rc add 9x due:361h};               # 41
+qx{../src/task rc:urgency.rc add 9a due:-10d};               # 18
+qx{../src/task rc:urgency.rc add 9b due:-7d};                # 19
+qx{../src/task rc:urgency.rc add 9c due:-6d};                # 20
+qx{../src/task rc:urgency.rc add 9d due:-5d};                # 21
+qx{../src/task rc:urgency.rc add 9e due:-4d};                # 22
+qx{../src/task rc:urgency.rc add 9f due:-3d};                # 23
+qx{../src/task rc:urgency.rc add 9g due:-2d};                # 24
+qx{../src/task rc:urgency.rc add 9h due:-1d};                # 25
+qx{../src/task rc:urgency.rc add 9i due:now};                # 26
+qx{../src/task rc:urgency.rc add 9j due:25h};                # 27
+qx{../src/task rc:urgency.rc add 9k due:49h};                # 28
+qx{../src/task rc:urgency.rc add 9l due:73h};                # 29
+qx{../src/task rc:urgency.rc add 9m due:97h};                # 30
+qx{../src/task rc:urgency.rc add 9n due:121h};               # 31
+qx{../src/task rc:urgency.rc add 9o due:145h};               # 32
+qx{../src/task rc:urgency.rc add 9p due:169h};               # 33
+qx{../src/task rc:urgency.rc add 9q due:193h};               # 34
+qx{../src/task rc:urgency.rc add 9r due:217h};               # 35
+qx{../src/task rc:urgency.rc add 9s due:241h};               # 36
+qx{../src/task rc:urgency.rc add 9t due:265h};               # 37
+qx{../src/task rc:urgency.rc add 9u due:289h};               # 38
+qx{../src/task rc:urgency.rc add 9v due:313h};               # 39
+qx{../src/task rc:urgency.rc add 9w due:337h};               # 40
+qx{../src/task rc:urgency.rc add 9x due:361h};               # 41
 
 # due: 10 (due:-10d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 18 _urgency};
+$output = qx{../src/task rc:urgency.rc 18 _urgency};
 like ($output, qr/urgency 30$/ms, 'due:-10d = 30');
 
 # due: 10 (due:-7d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 19 _urgency};
+$output = qx{../src/task rc:urgency.rc 19 _urgency};
 like ($output, qr/urgency 30$/ms, 'due:-7d = 30');
 
 # due: 9.6 (due:-6d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 20 _urgency};
+$output = qx{../src/task rc:urgency.rc 20 _urgency};
 like ($output, qr/urgency 29.6/ms, 'due:-6d = 29.6');
 
 # due: 9.2 (due:-5d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 21 _urgency};
+$output = qx{../src/task rc:urgency.rc 21 _urgency};
 like ($output, qr/urgency 29.2/ms, 'due:-5d = 29.2');
 
 # due: 8.8 (due:-4d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 22 _urgency};
+$output = qx{../src/task rc:urgency.rc 22 _urgency};
 like ($output, qr/urgency 28.8/ms, 'due:-4d = 28.8');
 
 # due: 8.4 (due:-3d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 23 _urgency};
+$output = qx{../src/task rc:urgency.rc 23 _urgency};
 like ($output, qr/urgency 28.4/ms, 'due:-3d = 28.4');
 
 # due: 8 (due:-2d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 24 _urgency};
+$output = qx{../src/task rc:urgency.rc 24 _urgency};
 like ($output, qr/urgency 28/ms, 'due:-2d = 28');
 
 # due: 7.6 (due:-1d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 25 _urgency};
+$output = qx{../src/task rc:urgency.rc 25 _urgency};
 like ($output, qr/urgency 27.6/ms, 'due:-1d = 27.6');
 
 # due: 7.2 (due:now) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 26 _urgency};
+$output = qx{../src/task rc:urgency.rc 26 _urgency};
 like ($output, qr/urgency 27.2$/ms, 'due:now = 27.2');
 
 # due: 6.8 (due:1d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 27 _urgency};
+$output = qx{../src/task rc:urgency.rc 27 _urgency};
 like ($output, qr/urgency 26.8/ms, 'due:1d = 26.8');
 
 # due: 6.4 (due:2d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 28 _urgency};
+$output = qx{../src/task rc:urgency.rc 28 _urgency};
 like ($output, qr/urgency 26.4/ms, 'due:2d = 26.4');
 
 # due: 6 (due:3d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 29 _urgency};
+$output = qx{../src/task rc:urgency.rc 29 _urgency};
 like ($output, qr/urgency 26/ms, 'due:3d = 26');
 
 # due: 5.6 (due:4d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 30 _urgency};
+$output = qx{../src/task rc:urgency.rc 30 _urgency};
 like ($output, qr/urgency 25.6/ms, 'due:4d = 25.6');
 
 # due: 5.2 (due:5d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 31 _urgency};
+$output = qx{../src/task rc:urgency.rc 31 _urgency};
 like ($output, qr/urgency 25.2/ms, 'due:5d = 25.2');
 
 # due: 4.8 (due:6d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 32 _urgency};
+$output = qx{../src/task rc:urgency.rc 32 _urgency};
 like ($output, qr/urgency 24.8/ms, 'due:6d = 24.8');
 
 # due: 4.4 (due:7d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 33 _urgency};
+$output = qx{../src/task rc:urgency.rc 33 _urgency};
 like ($output, qr/urgency 24.4/ms, 'due:7d = 24.4');
 
 # due: 4 (due:8d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 34 _urgency};
+$output = qx{../src/task rc:urgency.rc 34 _urgency};
 like ($output, qr/urgency 24/ms, 'due:8d = 24');
 
 # due: 3.6 (due:9d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 35 _urgency};
+$output = qx{../src/task rc:urgency.rc 35 _urgency};
 like ($output, qr/urgency 23.6/ms, 'due:9d = 23.6');
 
 # due: 3.2 (due:10d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 36 _urgency};
+$output = qx{../src/task rc:urgency.rc 36 _urgency};
 like ($output, qr/urgency 23.2/ms, 'due:10d = 23.2');
 
 # due: 2.8 (due:11d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 37 _urgency};
+$output = qx{../src/task rc:urgency.rc 37 _urgency};
 like ($output, qr/urgency 22.8/ms, 'due:11d = 22.8');
 
 # due: 2.4 (due:12d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 38 _urgency};
+$output = qx{../src/task rc:urgency.rc 38 _urgency};
 like ($output, qr/urgency 22.4/ms, 'due:12d = 22.4');
 
 # due: 2 (due:13d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 39 _urgency};
+$output = qx{../src/task rc:urgency.rc 39 _urgency};
 like ($output, qr/urgency 22/ms, 'due:13d = 22');
 
 # due: 1.6 (due:14d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 40 _urgency};
+$output = qx{../src/task rc:urgency.rc 40 _urgency};
 like ($output, qr/urgency 21.6/ms, 'due:14d = 21.6');
 
 # due: 1.6 (due:20d) + 10 (pending) + 10 (unblocked)
-$output = qx{../task rc:urgency.rc 41 _urgency};
+$output = qx{../src/task rc:urgency.rc 41 _urgency};
 like ($output, qr/urgency 21.6$/ms, 'due:20d = 21.6');
 
 # user.project: 10 (pro:PROJECT) + 10 (project) + 10 (pending) + 10 (unblocked)
-qx{../task rc:urgency.rc add 10a project:PROJECT};        # 42
-$output = qx{../task rc:urgency.rc 42 _urgency};
+qx{../src/task rc:urgency.rc add 10a project:PROJECT};        # 42
+$output = qx{../src/task rc:urgency.rc 42 _urgency};
 like ($output, qr/urgency 40$/ms, 'pro:PROJECT = 40');
 
 # user.tag: 10 (+TAG) + 8 (1 tag) + 10 (pending) + 10 (unblocked)
-qx{../task rc:urgency.rc add 11a +TAG};                   # 43
-$output = qx{../task rc:urgency.rc 43 _urgency};
+qx{../src/task rc:urgency.rc add 11a +TAG};                   # 43
+$output = qx{../src/task rc:urgency.rc 43 _urgency};
 like ($output, qr/urgency 38$/ms, '+TAG = 38');
 
 # Cleanup.
diff --git a/test/utf8.t b/test/utf8.t
index 4ae2256ce..eec3fee0b 100755
--- a/test/utf8.t
+++ b/test/utf8.t
@@ -39,34 +39,34 @@ if (open my $fh, '>', 'utf8.rc')
 }
 
 # Add a task with UTF8 in the description.
-qx{../task rc:utf8.rc add Çirçös};
-qx{../task rc:utf8.rc add Hello world ☺};
-qx{../task rc:utf8.rc add ¥£€\$¢₡₢₣₤₥₦₧₨₩₪₫₭₮₯};
-qx{../task rc:utf8.rc add Pchnąć w tę łódź jeża lub ośm skrzyń fig};
-qx{../task rc:utf8.rc add ๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า};
-qx{../task rc:utf8.rc add イロハニホヘト チリヌルヲ ワカヨタレソ ツネナラム};
-qx{../task rc:utf8.rc add いろはにほへとちりぬるを};
-qx{../task rc:utf8.rc add D\\'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh};
-qx{../task rc:utf8.rc add Árvíztűrő tükörfúrógép};
-qx{../task rc:utf8.rc add Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa};
-qx{../task rc:utf8.rc add Sævör grét áðan því úlpan var ónýt};
-qx{../task rc:utf8.rc add Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Wolther spillede på xylofon.};
-qx{../task rc:utf8.rc add Falsches Üben von Xylophonmusik quält jeden größeren Zwerg};
-qx{../task rc:utf8.rc add Zwölf Boxkämpfer jagten Eva quer über den Sylter Deich};
-qx{../task rc:utf8.rc add Heizölrückstoßabdämpfung};
-qx{../task rc:utf8.rc add Γαζέες καὶ μυρτιὲς δὲν θὰ βρῶ πιὰ στὸ χρυσαφὶ ξέφωτο};
-qx{../task rc:utf8.rc add Ξεσκεπάζω τὴν ψυχοφθόρα βδελυγμία};
+qx{../src/task rc:utf8.rc add Çirçös};
+qx{../src/task rc:utf8.rc add Hello world ☺};
+qx{../src/task rc:utf8.rc add ¥£€\$¢₡₢₣₤₥₦₧₨₩₪₫₭₮₯};
+qx{../src/task rc:utf8.rc add Pchnąć w tę łódź jeża lub ośm skrzyń fig};
+qx{../src/task rc:utf8.rc add ๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า};
+qx{../src/task rc:utf8.rc add イロハニホヘト チリヌルヲ ワカヨタレソ ツネナラム};
+qx{../src/task rc:utf8.rc add いろはにほへとちりぬるを};
+qx{../src/task rc:utf8.rc add D\\'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh};
+qx{../src/task rc:utf8.rc add Árvíztűrő tükörfúrógép};
+qx{../src/task rc:utf8.rc add Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa};
+qx{../src/task rc:utf8.rc add Sævör grét áðan því úlpan var ónýt};
+qx{../src/task rc:utf8.rc add Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen Wolther spillede på xylofon.};
+qx{../src/task rc:utf8.rc add Falsches Üben von Xylophonmusik quält jeden größeren Zwerg};
+qx{../src/task rc:utf8.rc add Zwölf Boxkämpfer jagten Eva quer über den Sylter Deich};
+qx{../src/task rc:utf8.rc add Heizölrückstoßabdämpfung};
+qx{../src/task rc:utf8.rc add Γαζέες καὶ μυρτιὲς δὲν θὰ βρῶ πιὰ στὸ χρυσαφὶ ξέφωτο};
+qx{../src/task rc:utf8.rc add Ξεσκεπάζω τὴν ψυχοφθόρα βδελυγμία};
 
-my $output = qx{../task rc:utf8.rc ls};
+my $output = qx{../src/task rc:utf8.rc ls};
 diag ($output);
 like ($output, qr/17/, 'all 17 tasks shown');
 
-qx{../task rc:utf8.rc add project:Çirçös utf8 in project};
-$output = qx{../task rc:utf8.rc ls project:Çirçös};
+qx{../src/task rc:utf8.rc add project:Çirçös utf8 in project};
+$output = qx{../src/task rc:utf8.rc ls project:Çirçös};
 like ($output, qr/Çirçös.+utf8 in project/, 'utf8 in project works');
 
-qx{../task rc:utf8.rc add utf8 in tag +Zwölf};
-$output = qx{../task rc:utf8.rc ls +Zwölf};
+qx{../src/task rc:utf8.rc add utf8 in tag +Zwölf};
+$output = qx{../src/task rc:utf8.rc ls +Zwölf};
 like ($output, qr/utf8 in tag/, 'utf8 in tag works');
 
 # Cleanup.
diff --git a/test/wait.t b/test/wait.t
index 764c85237..0eecbd82d 100755
--- a/test/wait.t
+++ b/test/wait.t
@@ -41,40 +41,40 @@ if (open my $fh, '>', 'wait.rc')
 }
 
 # Add a waiting task, check it is not there, wait, then check it is.
-qx{../task rc:wait.rc add yeswait wait:2s};
-qx{../task rc:wait.rc add nowait};
+qx{../src/task rc:wait.rc add yeswait wait:2s};
+qx{../src/task rc:wait.rc add nowait};
 
-my $output = qx{../task rc:wait.rc ls};
+my $output = qx{../src/task rc:wait.rc ls};
 like ($output, qr/nowait/ms, 'non-waiting task visible');
 unlike ($output, qr/yeswait/ms, 'waiting task invisible');
 
 diag ("3 second delay");
 sleep 3;
 
-$output = qx{../task rc:wait.rc ls};
+$output = qx{../src/task rc:wait.rc ls};
 like ($output, qr/nowait/ms, 'non-waiting task still visible');
 like ($output, qr/yeswait/ms, 'waiting task now visible');
 
-qx{../task rc:wait.rc 1 wait:2s};
-$output = qx{../task rc:wait.rc ls};
+qx{../src/task rc:wait.rc 1 wait:2s};
+$output = qx{../src/task rc:wait.rc ls};
 like ($output, qr/nowait/ms, 'non-waiting task visible');
 unlike ($output, qr/yeswait/ms, 'waiting task invisible');
 
 diag ("3 second delay");
 sleep 3;
 
-$output = qx{../task rc:wait.rc ls};
+$output = qx{../src/task rc:wait.rc ls};
 like ($output, qr/nowait/ms, 'non-waiting task still visible');
 like ($output, qr/yeswait/ms, 'waiting task now visible');
 
-qx{../task rc:wait.rc add wait:tomorrow tomorrow};
-$output = qx{../task rc:wait.rc ls};
+qx{../src/task rc:wait.rc add wait:tomorrow tomorrow};
+$output = qx{../src/task rc:wait.rc ls};
 unlike ($output, qr/tomorrow/ms, 'waiting task invisible');
 
-$output = qx{../task rc:wait.rc all status:waiting wait:tomorrow};
+$output = qx{../src/task rc:wait.rc all status:waiting wait:tomorrow};
 like ($output, qr/tomorrow/ms, 'waiting task visible when specifically queried');
 
-$output = qx{../task rc:wait.rc add Complain due:today wait:tomorrow};
+$output = qx{../src/task rc:wait.rc add Complain due:today wait:tomorrow};
 like ($output, qr/A 'wait' date must be before a 'due' date\./, 'error on wait after due');
 
 # Cleanup.