diff --git a/firmware/Makefile b/firmware/Makefile
index 3fc7cb6..ea85849 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -124,8 +124,8 @@ CSRC = $(ALLCSRC) $(BOARDDIR)/board.c
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CPPSRC = $(ALLCPPSRC) \
+          $(BOARDDIR)/port.cpp \
           shared/flash.cpp \
-          analog_input.cpp \
           can.cpp \
           can_helper.cpp \
           fault.cpp \
@@ -146,7 +146,7 @@ ASMSRC = $(ALLASMSRC)
 ASMXSRC = $(ALLXASMSRC)
 
 # Inclusion directories.
-INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC)
+INCDIR = $(CONFDIR) $(ALLINC) $(TESTINC) boards/
 
 # Define C warning options here.
 CWARN = -Wall -Wextra -Wundef -Wstrict-prototypes
diff --git a/firmware/analog_input.cpp b/firmware/boards/f0_module/port.cpp
similarity index 97%
rename from firmware/analog_input.cpp
rename to firmware/boards/f0_module/port.cpp
index e0bd8dc..abbb9ff 100644
--- a/firmware/analog_input.cpp
+++ b/firmware/boards/f0_module/port.cpp
@@ -1,4 +1,4 @@
-#include "analog_input.h"
+#include "port.h"
 
 #include "wideband_config.h"
 
diff --git a/firmware/analog_input.h b/firmware/boards/port.h
similarity index 100%
rename from firmware/analog_input.h
rename to firmware/boards/port.h
diff --git a/firmware/sampling.cpp b/firmware/sampling.cpp
index 0099097..1e3dc84 100644
--- a/firmware/sampling.cpp
+++ b/firmware/sampling.cpp
@@ -5,7 +5,7 @@
 
 #include "wideband_config.h"
 
-#include "analog_input.h"
+#include "port.h"
 
 // Stored results
 float nernstAc = 0;