Revert "Tweak method definitions"

This reverts commit 8992a49c2ff4c0e5b849fe7c4e71eb078b295d89.
Be specify about build dir