[Rename] Renamed folders and files to represent their namespaces
[Rename] Renamed folders and files to represent their namespaces
[Refactor] Removed extraneous empty comments