diff --git a/.licenserc.yaml b/.licenserc.yaml
index 1e93356e0..76a554585 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -4,30 +4,26 @@ header:
     copyright-owner: Apache Software Foundation
 
   paths-ignore:
-    - 'dist'
-    - 'licenses'
-    - '**/*.md'
-    - 'LICENSE'
-    - 'DISCLAIMER-WIP'
-    - 'NOTICE'
     - '.*'
     - '.**/**'
+    - 'repositories.bzl'
+    - 'CNAME'
+    - 'WORKSPACE'
     - '**/*.conf'
     - '**/*.config'
     - '**/*.json'
     - '**/*.sol'
-    - '**/*.yaml'
-    - '**/*.css'
-    - '**/*.yml'
-    - 'repositories.bzl'
-    - 'documents/**'
-    - 'CNAME'
-    - 'DISCLAIMER'
-    - 'Docker/**'
-    - 'WORKSPACE'
-    - 'skywalking-eyes/**'
-    - 'third_party/**.BUILD'
-    - 'third_party/loc_script/src/index.js'
+    - '**/*.pri'
+    - '**/*.pub'
+    - 'Doxyfile'
+    - 'header'
+    - 'dev/.rat-excludes'
+    - '**/*.md'
+    - 'DISCLAIMER-WIP'
+    - 'NOTICE'
+    - 'LICENSE'
+    - 'documents/doxygen/.gitignore'
+
 
 
   comment: on-failure
diff --git a/dev/.rat-excludes b/dev/.rat-excludes
index aa54fb8a2..7889a072b 100644
--- a/dev/.rat-excludes
+++ b/dev/.rat-excludes
@@ -14,7 +14,6 @@ build
 .*\.config
 .*\.pub
 .*\.pri
-.*\.BUILD
 Doxyfile
 header
 .*\.sol
diff --git a/executor/contract/manager/contract_manager_test.cpp b/executor/contract/manager/contract_manager_test.cpp
index 23746b49a..32540bd46 100644
--- a/executor/contract/manager/contract_manager_test.cpp
+++ b/executor/contract/manager/contract_manager_test.cpp
@@ -34,7 +34,7 @@ using ::testing::Test;
 
 const std::string test_dir = std::string(getenv("TEST_SRCDIR")) + "/" +
                              std::string(getenv("TEST_WORKSPACE")) +
-                             "/service/contract/executor/manager/";
+                             "/executor/contract/manager/";
 
 Address get_random_address() { return AddressManager().CreateRandomAddress(); }
 
diff --git a/third_party/asio.BUILD b/third_party/asio.BUILD
index 9fe1dd3ef..6f8eb603c 100644
--- a/third_party/asio.BUILD
+++ b/third_party/asio.BUILD
@@ -1,7 +1,27 @@
-licenses(["notice"])
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 
+licenses(["notice"])
 exports_files(["LICENSE"])
 
+package(default_visibility = ["//visibility:public"])
+
 cc_library(
     name = "asio",
     srcs = glob([
@@ -15,5 +35,4 @@ cc_library(
         "asio/**/*.ipp",
     ]),
     includes = ["asio/include"],
-    visibility = ["//visibility:public"],
 )
diff --git a/third_party/civetweb.BUILD b/third_party/civetweb.BUILD
index a91b3c447..02a6de22a 100644
--- a/third_party/civetweb.BUILD
+++ b/third_party/civetweb.BUILD
@@ -1,3 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+licenses(["notice"])
+exports_files(["LICENSE"])
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/third_party/crow.BUILD b/third_party/crow.BUILD
index 20cfcfcdc..3b0765a53 100644
--- a/third_party/crow.BUILD
+++ b/third_party/crow.BUILD
@@ -1,7 +1,27 @@
-licenses(["notice"])
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 
+licenses(["notice"])
 exports_files(["LICENSE"])
 
+package(default_visibility = ["//visibility:public"])
+
 cc_library(
     name = "crow",
     srcs = glob([
@@ -14,6 +34,5 @@ cc_library(
     ]),
     includes = ["include"],
     linkopts = ["-lpthread"],
-    visibility = ["//visibility:public"],
     deps = ["//external:asio",],
 ) 
diff --git a/third_party/date.BUILD b/third_party/date.BUILD
index e7335ff4e..b5bff376c 100644
--- a/third_party/date.BUILD
+++ b/third_party/date.BUILD
@@ -1,11 +1,30 @@
-licenses(["notice"])
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 
+licenses(["notice"])
 exports_files(["LICENSE"])
 
+package(default_visibility = ["//visibility:public"])
+
 cc_library(
     name = "date",
     srcs = glob(["src/**/*.cc"]),
     hdrs = glob(["include/**/*.h"]),
     includes = ["include"],
-    visibility = ["//visibility:public"],
-)
\ No newline at end of file
+)
diff --git a/third_party/eEVM.BUILD b/third_party/eEVM.BUILD
index 5411dfee6..684a495f7 100644
--- a/third_party/eEVM.BUILD
+++ b/third_party/eEVM.BUILD
@@ -1,6 +1,26 @@
-package(default_visibility = ["//visibility:public"])
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+licenses(["notice"])
+exports_files(["LICENSE"])
 
-load("@rules_foreign_cc//foreign_cc:defs.bzl", "cmake")
+package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "eEVM",
@@ -31,6 +51,5 @@ cc_library(
         "3rdparty/intx/include",
         "3rdparty/keccak",
     ],
-    #linkstatic = 1,
     visibility = ["//visibility:public"],
 )
diff --git a/third_party/json.BUILD b/third_party/json.BUILD
index 748297d4f..20cee567a 100644
--- a/third_party/json.BUILD
+++ b/third_party/json.BUILD
@@ -1,7 +1,26 @@
-package(default_visibility = ["//visibility:public"])
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 
-load("@rules_cc//cc:defs.bzl", "cc_library")
+licenses(["notice"])
+exports_files(["LICENSE"])
 
+package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "json",
diff --git a/third_party/leveldb.BUILD b/third_party/leveldb.BUILD
index b5cb80704..cb7be9fba 100644
--- a/third_party/leveldb.BUILD
+++ b/third_party/leveldb.BUILD
@@ -1,3 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+licenses(["notice"])
+exports_files(["LICENSE"])
+
+package(default_visibility = ["//visibility:public"])
+
 cc_library(
     name = "leveldb",
     srcs = glob(
@@ -27,5 +51,4 @@ cc_library(
         ".",
         "include",
     ],
-    visibility = ["//visibility:public"],
 )
diff --git a/third_party/prometheus.BUILD b/third_party/prometheus.BUILD
index 866f397f9..7827d7063 100644
--- a/third_party/prometheus.BUILD
+++ b/third_party/prometheus.BUILD
@@ -1,4 +1,26 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 licenses(["notice"])
+exports_files(["LICENSE"])
+
+package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "prometheus",
diff --git a/third_party/rapidjson.BUILD b/third_party/rapidjson.BUILD
index 63f5aac61..d0430a5c9 100644
--- a/third_party/rapidjson.BUILD
+++ b/third_party/rapidjson.BUILD
@@ -1,3 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+licenses(["notice"])
+exports_files(["LICENSE"])
+
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
diff --git a/third_party/snappy.BUILD b/third_party/snappy.BUILD
index 56d1c394b..54d0a187d 100644
--- a/third_party/snappy.BUILD
+++ b/third_party/snappy.BUILD
@@ -1,6 +1,27 @@
-package(default_visibility = ["//visibility:public"])
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 
-licenses(["notice"])  # BSD 3-clause
+licenses(["notice"])
+exports_files(["LICENSE"])
+
+package(default_visibility = ["//visibility:public"])
 
 filegroup(
     name = "license",
diff --git a/third_party/z.BUILD b/third_party/z.BUILD
index 34cd232c2..115995a4c 100644
--- a/third_party/z.BUILD
+++ b/third_party/z.BUILD
@@ -1,16 +1,34 @@
-# copied from: https://github.com/bazelbuild/bazel/blob/master/third_party/zlib/BUILD
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 
-licenses(["notice"])  # BSD/MIT-like license (for zlib)
+licenses(["notice"])
+exports_files(["LICENSE"])
+
+package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "z",
     srcs = glob(["*.c"]),
     hdrs = glob(["*.h"]),
-    # Use -Dverbose=-1 to turn off zlib's trace logging. (bazelbuild/bazel#3280)
     copts = [
         "-w",
         "-Dverbose=-1",
     ],
     includes = ["."],
-    visibility = ["//visibility:public"],
 )
diff --git a/third_party/zlib.BUILD b/third_party/zlib.BUILD
index 7a0b0216c..c94061643 100644
--- a/third_party/zlib.BUILD
+++ b/third_party/zlib.BUILD
@@ -1,6 +1,26 @@
-licenses(["notice"])  # BSD/MIT-like license (for zlib)
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
 
-# Modified from https://github.com/tensorflow/tensorflow/blob/master/zlib.BUILD
+licenses(["notice"])
+exports_files(["LICENSE"])
+
+package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "zlib",
@@ -37,5 +57,4 @@ cc_library(
     copts = [
         "-D_LARGEFILE64_SOURCE=1",
     ],
-    visibility = ["//visibility:public"],
 )