Folder organization change

New master folder