2013-02-07: reorganizing the structure for getting a slim OSLiC