Move to own directory to avoid name collision with _bootstrap