Revert "Revert "Revert "renamed and modified"""

Reverts reviewninja/foo#120