3.0 - Moving File and Folder to their own namespace