Revert "Refactored dummy to firms"

This reverts commit 91849a64ca6c35b4cd9b27c93df5a68b80657159.