Renamed and altered View structure
Subviews now are in folders starting with _