Revert "Rechecking with deleted com folder."

This reverts commit 166069160c7e0baa03a5425945b2eb98f0036595.
Reverting to deleted com folder