Structure adjustments for inclusion in F-Driod and mae it ready for realeas 2.0.5
