diff --git a/redpitaya/client/gr_add_const_set_offset.xml b/redpitaya/client/gr_rp_blocks/gr_add_const_set_offset.xml
similarity index 100%
rename from redpitaya/client/gr_add_const_set_offset.xml
rename to redpitaya/client/gr_rp_blocks/gr_add_const_set_offset.xml
diff --git a/redpitaya/client/gr_nco_counter_send_conf.xml b/redpitaya/client/gr_rp_blocks/gr_nco_counter_send_conf.xml
similarity index 100%
rename from redpitaya/client/gr_nco_counter_send_conf.xml
rename to redpitaya/client/gr_rp_blocks/gr_nco_counter_send_conf.xml
diff --git a/redpitaya/client/gr_source_test.xml b/redpitaya/client/gr_rp_blocks/gr_source_test.xml
similarity index 100%
rename from redpitaya/client/gr_source_test.xml
rename to redpitaya/client/gr_rp_blocks/gr_source_test.xml
diff --git a/redpitaya/client/gr_source_test.xml.old b/redpitaya/client/gr_rp_blocks/gr_source_test.xml.old
similarity index 100%
rename from redpitaya/client/gr_source_test.xml.old
rename to redpitaya/client/gr_rp_blocks/gr_source_test.xml.old
diff --git a/redpitaya/client/redpitaya_gnuradio.py b/redpitaya/client/gr_rp_blocks/redpitaya_gnuradio.py
similarity index 100%
rename from redpitaya/client/redpitaya_gnuradio.py
rename to redpitaya/client/gr_rp_blocks/redpitaya_gnuradio.py
diff --git a/redpitaya/client/redpitaya_gnuradio.pyc b/redpitaya/client/gr_rp_blocks/redpitaya_gnuradio.pyc
similarity index 100%
rename from redpitaya/client/redpitaya_gnuradio.pyc
rename to redpitaya/client/gr_rp_blocks/redpitaya_gnuradio.pyc
diff --git a/redpitaya/client/sourceme.bma b/redpitaya/client/sourceme.bma
deleted file mode 100644
index 23cd7f3..0000000
--- a/redpitaya/client/sourceme.bma
+++ /dev/null
@@ -1 +0,0 @@
-export GRC_BLOCKS_PATH=.