Remove placeholder and Update Folder Structure.