some rearrangement
Paradiseo added as internal library