Rearranjed os_default includes and collectd modules