Structure adjustments for inclusion in F-Droid and make it ready for release 2.0.5