adding serf and renamed folders