Revert "Merge branch 'priyam3nidhi-add_subdir'"

This reverts commit 55cc712da764df92765a07223475d5d1dfd3c67b, reversing
changes made to 53919acf3d4d950cdae7c182095cd6a2eea196f9.