Renamed dirs, fixed some docs
Renamed dirs, fixed some docs