The problem we have is explained in this scheme
Moved the tests
Moved everything related to Critical Regions
Got rid of the default package
Changed the protocol strings so that it can be possible to split them properly in Java