Rrdmodify master

Modularization & Bugfixes