Folder structure change with 1.0.0 version