diff --git a/src/bpmlib/package_utils.go b/src/bpmlib/packages.go
similarity index 100%
rename from src/bpmlib/package_utils.go
rename to src/bpmlib/packages.go
diff --git a/src/bpmlib/repo_utils.go b/src/bpmlib/repositories.go
similarity index 100%
rename from src/bpmlib/repo_utils.go
rename to src/bpmlib/repositories.go
diff --git a/src/bpmlib/extract_utils.go b/src/bpmlib/tarball.go
similarity index 100%
rename from src/bpmlib/extract_utils.go
rename to src/bpmlib/tarball.go
diff --git a/src/bpmlib/general_utils.go b/src/bpmlib/utils.go
similarity index 100%
rename from src/bpmlib/general_utils.go
rename to src/bpmlib/utils.go