Folder reorg and instructions updated