Adaptation for maven, some simplification for figures.