Organize builtin into subdirectories