Renamed system package to base package. Fixed up some types and redundencies.