Added Infrastructure classes.
Added and updated Core classess.