Remove creation of root directory folders am: c97e1cb39d
am: 5c331c5be8

* commit '5c331c5be821fe5c900cee56a842a3a8b4a12315':