Added backup folders creation, minor cleanup