Fix Folder location problems and Test