From c022a472cf87fe63b3f54e9254ea43838048e130 Mon Sep 17 00:00:00 2001
From: James Ranson <james@ranson.org>
Date: Tue, 10 Apr 2018 11:42:05 -0600
Subject: [PATCH 1/3] Add code license header and increment to 0.0.12

---
 cache.go         | 12 ++++++++++++
 config.go        | 12 ++++++++++++
 constants.go     | 12 ++++++++++++
 filesystem.go    | 12 ++++++++++++
 flags.go         | 12 ++++++++++++
 handlers.go      | 12 ++++++++++++
 handlers_test.go | 12 ++++++++++++
 logging.go       | 12 ++++++++++++
 main.go          | 14 +++++++++++++-
 memory.go        | 12 ++++++++++++
 metrics.go       | 12 ++++++++++++
 model.go         | 12 ++++++++++++
 redis.go         | 10 ++++++++++
 13 files changed, 155 insertions(+), 1 deletion(-)

diff --git a/cache.go b/cache.go
index 8d86be4f8..e9083b4d0 100644
--- a/cache.go
+++ b/cache.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 // Cache is the interface for the supported caching fabrics
 // When making new cache types, Retrieve() must return an error on cache miss
 type Cache interface {
diff --git a/config.go b/config.go
index c586e84cf..d5f142228 100644
--- a/config.go
+++ b/config.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import (
 	"github.com/BurntSushi/toml"
 )
diff --git a/constants.go b/constants.go
index 792645956..42acac5fa 100644
--- a/constants.go
+++ b/constants.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 const trickster = "trickster"
 
 // Origin Database Types
diff --git a/filesystem.go b/filesystem.go
index c0a2c0356..355f6e12f 100644
--- a/filesystem.go
+++ b/filesystem.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import (
 	"fmt"
 	"io/ioutil"
diff --git a/flags.go b/flags.go
index 51f8095b4..b0bc6e417 100644
--- a/flags.go
+++ b/flags.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import (
 	"flag"
 	"fmt"
diff --git a/handlers.go b/handlers.go
index a411d6dae..f71c234cd 100644
--- a/handlers.go
+++ b/handlers.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import (
 	"crypto/md5"
 	"encoding/json"
diff --git a/handlers_test.go b/handlers_test.go
index 095c10e65..7bfbbf915 100644
--- a/handlers_test.go
+++ b/handlers_test.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import "testing"
 
 func TestParseTime(t *testing.T) {
diff --git a/logging.go b/logging.go
index 4cb3b3548..4de9e65c9 100644
--- a/logging.go
+++ b/logging.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import (
 	"fmt"
 	"io"
diff --git a/main.go b/main.go
index 6e76133f5..7816e7552 100644
--- a/main.go
+++ b/main.go
@@ -2,6 +2,18 @@ package main
 
 // Trickster - Reverse Proxy Cache for Prometheus HTTP API
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import (
 	"fmt"
 	"net/http"
@@ -12,7 +24,7 @@ import (
 	"github.com/gorilla/mux"
 )
 
-const progversion = "0.0.11"
+const progversion = "0.0.12"
 
 // main function to boot up everything
 func main() {
diff --git a/memory.go b/memory.go
index 7c97a6210..85f1c55ac 100644
--- a/memory.go
+++ b/memory.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import (
 	"fmt"
 	"sync"
diff --git a/metrics.go b/metrics.go
index 9661c1519..d279506bd 100644
--- a/metrics.go
+++ b/metrics.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import (
 	"fmt"
 	"net/http"
diff --git a/model.go b/model.go
index 35357c022..0d62bce79 100644
--- a/model.go
+++ b/model.go
@@ -1,5 +1,17 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import (
 	"net/http"
 	"net/url"
diff --git a/redis.go b/redis.go
index 76ef088ae..e4569f952 100644
--- a/redis.go
+++ b/redis.go
@@ -1,5 +1,15 @@
 package main
 
+/**
+* Copyright 2018 Comcast Cable Communications Management, LLC
+* Licensed 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.
+ */
+
 import (
 	"sync"
 	"time"

From 7195ff294b0434933d70e071dda493197a8262f6 Mon Sep 17 00:00:00 2001
From: James Ranson <james@ranson.org>
Date: Tue, 10 Apr 2018 11:45:04 -0600
Subject: [PATCH 2/3] Cleanup License Comment formatting

---
 cache.go         | 3 ++-
 config.go        | 3 ++-
 constants.go     | 3 ++-
 filesystem.go    | 3 ++-
 flags.go         | 3 ++-
 handlers.go      | 3 ++-
 handlers_test.go | 3 ++-
 logging.go       | 3 ++-
 main.go          | 3 ++-
 memory.go        | 3 ++-
 metrics.go       | 3 ++-
 model.go         | 3 ++-
 redis.go         | 7 +++++--
 13 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/cache.go b/cache.go
index e9083b4d0..4741576bc 100644
--- a/cache.go
+++ b/cache.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/config.go b/config.go
index d5f142228..7b6d6e657 100644
--- a/config.go
+++ b/config.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/constants.go b/constants.go
index 42acac5fa..3c897cb83 100644
--- a/constants.go
+++ b/constants.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/filesystem.go b/filesystem.go
index 355f6e12f..a3dd8b614 100644
--- a/filesystem.go
+++ b/filesystem.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/flags.go b/flags.go
index b0bc6e417..0eab5ae79 100644
--- a/flags.go
+++ b/flags.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/handlers.go b/handlers.go
index f71c234cd..6c8ef24c4 100644
--- a/handlers.go
+++ b/handlers.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/handlers_test.go b/handlers_test.go
index 7bfbbf915..7d69dcdb7 100644
--- a/handlers_test.go
+++ b/handlers_test.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/logging.go b/logging.go
index 4de9e65c9..4fcb2b88e 100644
--- a/logging.go
+++ b/logging.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/main.go b/main.go
index 7816e7552..ab0f449b6 100644
--- a/main.go
+++ b/main.go
@@ -10,7 +10,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/memory.go b/memory.go
index 85f1c55ac..02814da7a 100644
--- a/memory.go
+++ b/memory.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/metrics.go b/metrics.go
index d279506bd..180372b07 100644
--- a/metrics.go
+++ b/metrics.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/model.go b/model.go
index 0d62bce79..40d79fde0 100644
--- a/model.go
+++ b/model.go
@@ -8,7 +8,8 @@ package main
 * 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
+* 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.
  */
 
diff --git a/redis.go b/redis.go
index e4569f952..394b3ad9f 100644
--- a/redis.go
+++ b/redis.go
@@ -2,11 +2,14 @@ package main
 
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
-* Licensed 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
+* Licensed 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
+* 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.
  */
 

From 4aa50dc132fdf14962ac25128cbea567098f9543 Mon Sep 17 00:00:00 2001
From: James Ranson <james@ranson.org>
Date: Tue, 10 Apr 2018 11:46:21 -0600
Subject: [PATCH 3/3] Cleanup License Comment formatting

---
 cache.go         | 4 ++--
 config.go        | 4 ++--
 constants.go     | 4 ++--
 filesystem.go    | 4 ++--
 flags.go         | 4 ++--
 handlers.go      | 4 ++--
 handlers_test.go | 4 ++--
 logging.go       | 4 ++--
 main.go          | 6 ++----
 memory.go        | 4 ++--
 metrics.go       | 4 ++--
 model.go         | 4 ++--
 redis.go         | 4 ++--
 13 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/cache.go b/cache.go
index 4741576bc..8760cdf6e 100644
--- a/cache.go
+++ b/cache.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 // Cache is the interface for the supported caching fabrics
 // When making new cache types, Retrieve() must return an error on cache miss
 type Cache interface {
diff --git a/config.go b/config.go
index 7b6d6e657..e55131ec7 100644
--- a/config.go
+++ b/config.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import (
 	"github.com/BurntSushi/toml"
 )
diff --git a/constants.go b/constants.go
index 3c897cb83..e6f09ff08 100644
--- a/constants.go
+++ b/constants.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 const trickster = "trickster"
 
 // Origin Database Types
diff --git a/filesystem.go b/filesystem.go
index a3dd8b614..763181967 100644
--- a/filesystem.go
+++ b/filesystem.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import (
 	"fmt"
 	"io/ioutil"
diff --git a/flags.go b/flags.go
index 0eab5ae79..efac4582d 100644
--- a/flags.go
+++ b/flags.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import (
 	"flag"
 	"fmt"
diff --git a/handlers.go b/handlers.go
index 6c8ef24c4..e0dd40d9b 100644
--- a/handlers.go
+++ b/handlers.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import (
 	"crypto/md5"
 	"encoding/json"
diff --git a/handlers_test.go b/handlers_test.go
index 7d69dcdb7..1d1c17e7e 100644
--- a/handlers_test.go
+++ b/handlers_test.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import "testing"
 
 func TestParseTime(t *testing.T) {
diff --git a/logging.go b/logging.go
index 4fcb2b88e..081c86d78 100644
--- a/logging.go
+++ b/logging.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import (
 	"fmt"
 	"io"
diff --git a/main.go b/main.go
index ab0f449b6..cbbaef18d 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,3 @@
-package main
-
-// Trickster - Reverse Proxy Cache for Prometheus HTTP API
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import (
 	"fmt"
 	"net/http"
diff --git a/memory.go b/memory.go
index 02814da7a..4058c9463 100644
--- a/memory.go
+++ b/memory.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import (
 	"fmt"
 	"sync"
diff --git a/metrics.go b/metrics.go
index 180372b07..eb42ad0b2 100644
--- a/metrics.go
+++ b/metrics.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import (
 	"fmt"
 	"net/http"
diff --git a/model.go b/model.go
index 40d79fde0..4cb667d21 100644
--- a/model.go
+++ b/model.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import (
 	"net/http"
 	"net/url"
diff --git a/redis.go b/redis.go
index 394b3ad9f..e092612a9 100644
--- a/redis.go
+++ b/redis.go
@@ -1,5 +1,3 @@
-package main
-
 /**
 * Copyright 2018 Comcast Cable Communications Management, LLC
 * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +11,8 @@ package main
 * limitations under the License.
  */
 
+package main
+
 import (
 	"sync"
 	"time"