Added singular root
Renamed and moved classes