CORE-6091 Implemented file/folder selector
CORE-6091 Code Cleanup