Rename from stack/stack to stack/builder