Deleted and renamed some project folders and have changes in manifests"
Uncomment some snippet for further progress