OilResivoir and structure generation changes

Warning: due to numberous problems with the generation of Oil resiviors,
this commit can be regarded highly unstable