Experimental refactoring of dataprotocols repo