diff --git a/make.sh b/make.sh
index c01a439..af6d329 100755
--- a/make.sh
+++ b/make.sh
@@ -1,2 +1,3 @@
 cargo build
-adb push target/armv7-unknown-linux-gnueabihf/debug/wavehunter /tmp/wavehunter
+adb push target/armv7-unknown-linux-gnueabihf/debug/wavehunter /data/wavehunter/wavehunter
+adb push target/armv7-unknown-linux-gnueabihf/debug/wavehunter-reader /data/wavehunter/wavehunter-reader
diff --git a/scripts/wavehunter_daemon b/scripts/wavehunter_daemon
index fea85b3..da469c4 100644
--- a/scripts/wavehunter_daemon
+++ b/scripts/wavehunter_daemon
@@ -6,7 +6,7 @@ case "$1" in
 start)
     echo -n "Starting wavehunter: "
     start-stop-daemon -S -b --make-pidfile --pidfile /tmp/wavehunter.pid \
-    --startas /bin/bash -- -c "exec /data/wavehunter > /data/wavehunter.log 2>&1"
+    --startas /bin/bash -- -c "exec /data/wavehunter/wavehunter > /data/wavehunter/wavehunter.log 2>&1"
     echo "done"
     ;;
   stop)
diff --git a/src/bin/wavehunter.rs b/src/bin/wavehunter.rs
index ed923a8..ec4628c 100644
--- a/src/bin/wavehunter.rs
+++ b/src/bin/wavehunter.rs
@@ -9,11 +9,14 @@ fn main() -> DiagResult<()> {
     env_logger::init();
 
     let mut dev = DiagDevice::new()?;
-    dev.enable_debug_mode("/data/wavehunter-debug")?;
+    dev.enable_debug_mode("/data/wavehunter/wavehunter-debug")?;
     dev.config_logs()?;
 
+    println!("The orca is hunting for stingrays...");
+
     let mut gsmtap_parser = GsmtapParser::new();
-    let mut pcap_file = PcapFile::new("/data/wavehunter.pcap").unwrap();
+    // We are going to want to add a timestamp to this pcap file eventually
+    let mut pcap_file = PcapFile::new("/data/wavehunter/wavehunter.pcap").unwrap();
     pcap_file.write_iface_header().unwrap();
 
     loop {