Reflect code changes and updated the missing settings tree
Updated project folder naming for clarity