Directory reorganization, and readme add