1.1 fixes

Root is now included as a folder