moved storage classes from upaas-builder into separate module