demo-src added. multiple file renames