Added File and Folder initial implementation