Refactored to single binary per project