diff --git a/core/pom.xml b/core/pom.xml
index aaf2d58ab..6616da169 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -70,14 +70,14 @@
                                 <configuration>
                                     <tasks>
                                         <path id="proto.path">
-                                            <fileset dir="src">
+                                            <fileset dir="src/main/proto">
                                                 <include name="**/*.proto"/>
                                             </fileset>
                                         </path>
                                         <pathconvert pathsep=" " property="proto.files" refid="proto.path"/>
                                         <exec executable="protoc" failonerror="true">
                                             <arg value="--java_out=${project.basedir}/src/main/java"/>
-                                            <arg value="-I${project.basedir}/src"/>
+                                            <arg value="-I${project.basedir}/src/main/proto"/>
                                             <arg line="${proto.files}"/>
                                         </exec>
                                     </tasks>
diff --git a/core/src/paymentchannel.proto b/core/src/main/proto/paymentchannel.proto
similarity index 100%
rename from core/src/paymentchannel.proto
rename to core/src/main/proto/paymentchannel.proto
diff --git a/core/src/paymentrequest.proto b/core/src/main/proto/paymentrequest.proto
similarity index 100%
rename from core/src/paymentrequest.proto
rename to core/src/main/proto/paymentrequest.proto
diff --git a/core/src/peerseeds.proto b/core/src/main/proto/peerseeds.proto
similarity index 100%
rename from core/src/peerseeds.proto
rename to core/src/main/proto/peerseeds.proto
diff --git a/core/src/storedclientpaymentchannel.proto b/core/src/main/proto/storedclientpaymentchannel.proto
similarity index 100%
rename from core/src/storedclientpaymentchannel.proto
rename to core/src/main/proto/storedclientpaymentchannel.proto
diff --git a/core/src/storedserverpaymentchannel.proto b/core/src/main/proto/storedserverpaymentchannel.proto
similarity index 100%
rename from core/src/storedserverpaymentchannel.proto
rename to core/src/main/proto/storedserverpaymentchannel.proto
diff --git a/core/src/wallet.proto b/core/src/main/proto/wallet.proto
similarity index 100%
rename from core/src/wallet.proto
rename to core/src/main/proto/wallet.proto