Fixed numerous folders in HS stuff