diff --git a/Makefile b/Makefile
index e008a382..08a5ca67 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GOVERSION=$(shell go version | awk '{print $$3;}')
-PACKAGES=database debian files http utils
-ALL_PACKAGES=aptly cmd console database debian files http utils
+PACKAGES=database deb files http utils
+ALL_PACKAGES=aptly cmd console database deb files http utils
 BINPATH=$(abspath ./_vendor/bin)
 GOM_ENVIRONMENT=-test
 PYTHON?=python
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 8a204545..cc2cc202 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -4,7 +4,7 @@ package cmd
 import (
 	"fmt"
 	"github.com/smira/aptly/aptly"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 	"os"
@@ -12,7 +12,7 @@ import (
 )
 
 // ListPackagesRefList shows list of packages in PackageRefList
-func ListPackagesRefList(reflist *debian.PackageRefList) (err error) {
+func ListPackagesRefList(reflist *deb.PackageRefList) (err error) {
 	fmt.Printf("Packages:\n")
 
 	if reflist == nil {
diff --git a/cmd/context.go b/cmd/context.go
index f464680f..11f41d3a 100644
--- a/cmd/context.go
+++ b/cmd/context.go
@@ -5,7 +5,7 @@ import (
 	"github.com/smira/aptly/aptly"
 	"github.com/smira/aptly/console"
 	"github.com/smira/aptly/database"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/aptly/files"
 	"github.com/smira/aptly/http"
 	"github.com/smira/aptly/utils"
@@ -28,7 +28,7 @@ type AptlyContext struct {
 	database          database.Storage
 	packagePool       aptly.PackagePool
 	publishedStorage  aptly.PublishedStorage
-	collectionFactory *debian.CollectionFactory
+	collectionFactory *deb.CollectionFactory
 	dependencyOptions int
 	architecturesList []string
 	// Debug features
@@ -91,16 +91,16 @@ func (context *AptlyContext) DependencyOptions() int {
 	if context.dependencyOptions == -1 {
 		context.dependencyOptions = 0
 		if context.Config().DepFollowSuggests || context.flags.Lookup("dep-follow-suggests").Value.Get().(bool) {
-			context.dependencyOptions |= debian.DepFollowSuggests
+			context.dependencyOptions |= deb.DepFollowSuggests
 		}
 		if context.Config().DepFollowRecommends || context.flags.Lookup("dep-follow-recommends").Value.Get().(bool) {
-			context.dependencyOptions |= debian.DepFollowRecommends
+			context.dependencyOptions |= deb.DepFollowRecommends
 		}
 		if context.Config().DepFollowAllVariants || context.flags.Lookup("dep-follow-all-variants").Value.Get().(bool) {
-			context.dependencyOptions |= debian.DepFollowAllVariants
+			context.dependencyOptions |= deb.DepFollowAllVariants
 		}
 		if context.Config().DepFollowSource || context.flags.Lookup("dep-follow-source").Value.Get().(bool) {
-			context.dependencyOptions |= debian.DepFollowSource
+			context.dependencyOptions |= deb.DepFollowSource
 		}
 	}
 
@@ -153,13 +153,13 @@ func (context *AptlyContext) Database() (database.Storage, error) {
 	return context.database, nil
 }
 
-func (context *AptlyContext) CollectionFactory() *debian.CollectionFactory {
+func (context *AptlyContext) CollectionFactory() *deb.CollectionFactory {
 	if context.collectionFactory == nil {
 		db, err := context.Database()
 		if err != nil {
 			Fatal(err)
 		}
-		context.collectionFactory = debian.NewCollectionFactory(db)
+		context.collectionFactory = deb.NewCollectionFactory(db)
 	}
 
 	return context.collectionFactory
diff --git a/cmd/db_cleanup.go b/cmd/db_cleanup.go
index cc54f4be..ae08347d 100644
--- a/cmd/db_cleanup.go
+++ b/cmd/db_cleanup.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/aptly/utils"
 	"github.com/smira/commander"
 	"sort"
@@ -18,10 +18,10 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
 	}
 
 	// collect information about references packages...
-	existingPackageRefs := debian.NewPackageRefList()
+	existingPackageRefs := deb.NewPackageRefList()
 
 	context.Progress().Printf("Loading mirrors, local repos and snapshots...\n")
-	err = context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *debian.RemoteRepo) error {
+	err = context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *deb.RemoteRepo) error {
 		err := context.CollectionFactory().RemoteRepoCollection().LoadComplete(repo)
 		if err != nil {
 			return err
@@ -35,7 +35,7 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
 		return err
 	}
 
-	err = context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *debian.LocalRepo) error {
+	err = context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *deb.LocalRepo) error {
 		err := context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
 		if err != nil {
 			return err
@@ -49,7 +49,7 @@ func aptlyDbCleanup(cmd *commander.Command, args []string) error {
 		return err
 	}
 
-	err = context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *debian.Snapshot) error {
+	err = context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *deb.Snapshot) error {
 		err := context.CollectionFactory().SnapshotCollection().LoadComplete(snapshot)
 		if err != nil {
 			return err
diff --git a/cmd/graph.go b/cmd/graph.go
index b6d9e5c9..7b5196e6 100644
--- a/cmd/graph.go
+++ b/cmd/graph.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"code.google.com/p/gographviz"
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"io"
 	"io/ioutil"
@@ -28,7 +28,7 @@ func aptlyGraph(cmd *commander.Command, args []string) error {
 
 	fmt.Printf("Loading mirrors...\n")
 
-	err = context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *debian.RemoteRepo) error {
+	err = context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *deb.RemoteRepo) error {
 		err := context.CollectionFactory().RemoteRepoCollection().LoadComplete(repo)
 		if err != nil {
 			return err
@@ -52,7 +52,7 @@ func aptlyGraph(cmd *commander.Command, args []string) error {
 
 	fmt.Printf("Loading local repos...\n")
 
-	err = context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *debian.LocalRepo) error {
+	err = context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *deb.LocalRepo) error {
 		err := context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
 		if err != nil {
 			return err
@@ -75,12 +75,12 @@ func aptlyGraph(cmd *commander.Command, args []string) error {
 
 	fmt.Printf("Loading snapshots...\n")
 
-	context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *debian.Snapshot) error {
+	context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *deb.Snapshot) error {
 		existingNodes[snapshot.UUID] = true
 		return nil
 	})
 
-	err = context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *debian.Snapshot) error {
+	err = context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *deb.Snapshot) error {
 		err := context.CollectionFactory().SnapshotCollection().LoadComplete(snapshot)
 		if err != nil {
 			return err
@@ -115,7 +115,7 @@ func aptlyGraph(cmd *commander.Command, args []string) error {
 
 	fmt.Printf("Loading published repos...\n")
 
-	context.CollectionFactory().PublishedRepoCollection().ForEach(func(repo *debian.PublishedRepo) error {
+	context.CollectionFactory().PublishedRepoCollection().ForEach(func(repo *deb.PublishedRepo) error {
 		graph.AddNode("aptly", graphvizEscape(repo.UUID), map[string]string{
 			"shape":     "Mrecord",
 			"style":     "filled",
diff --git a/cmd/mirror_create.go b/cmd/mirror_create.go
index 8350538f..d94d148b 100644
--- a/cmd/mirror_create.go
+++ b/cmd/mirror_create.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 	"strings"
@@ -24,7 +24,7 @@ func aptlyMirrorCreate(cmd *commander.Command, args []string) error {
 
 	mirrorName = args[0]
 	if len(args) == 2 {
-		archiveURL, distribution, components, err = debian.ParsePPA(args[1], context.Config())
+		archiveURL, distribution, components, err = deb.ParsePPA(args[1], context.Config())
 		if err != nil {
 			return err
 		}
@@ -32,7 +32,7 @@ func aptlyMirrorCreate(cmd *commander.Command, args []string) error {
 		archiveURL, distribution, components = args[1], args[2], args[3:]
 	}
 
-	repo, err := debian.NewRemoteRepo(mirrorName, archiveURL, distribution, components, context.ArchitecturesList(), downloadSources)
+	repo, err := deb.NewRemoteRepo(mirrorName, archiveURL, distribution, components, context.ArchitecturesList(), downloadSources)
 	if err != nil {
 		return fmt.Errorf("unable to create mirror: %s", err)
 	}
diff --git a/cmd/mirror_list.go b/cmd/mirror_list.go
index b5f6adb5..aa19a566 100644
--- a/cmd/mirror_list.go
+++ b/cmd/mirror_list.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"sort"
 )
@@ -18,7 +18,7 @@ func aptlyMirrorList(cmd *commander.Command, args []string) error {
 		fmt.Printf("List of mirrors:\n")
 		repos := make([]string, context.CollectionFactory().RemoteRepoCollection().Len())
 		i := 0
-		context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *debian.RemoteRepo) error {
+		context.CollectionFactory().RemoteRepoCollection().ForEach(func(repo *deb.RemoteRepo) error {
 			repos[i] = repo.String()
 			i++
 			return nil
diff --git a/cmd/publish_list.go b/cmd/publish_list.go
index 1b9cabd6..d2c35f1a 100644
--- a/cmd/publish_list.go
+++ b/cmd/publish_list.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"sort"
 )
@@ -21,7 +21,7 @@ func aptlyPublishList(cmd *commander.Command, args []string) error {
 
 	published := make([]string, 0, context.CollectionFactory().PublishedRepoCollection().Len())
 
-	err = context.CollectionFactory().PublishedRepoCollection().ForEach(func(repo *debian.PublishedRepo) error {
+	err = context.CollectionFactory().PublishedRepoCollection().ForEach(func(repo *deb.PublishedRepo) error {
 		err := context.CollectionFactory().PublishedRepoCollection().LoadComplete(repo, context.CollectionFactory())
 		if err != nil {
 			return err
diff --git a/cmd/publish_snapshot.go b/cmd/publish_snapshot.go
index ff1964a1..63596d1e 100644
--- a/cmd/publish_snapshot.go
+++ b/cmd/publish_snapshot.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
@@ -63,7 +63,7 @@ func aptlyPublishSnapshotOrRepo(cmd *commander.Command, args []string) error {
 	component := context.flags.Lookup("component").Value.String()
 	distribution := context.flags.Lookup("distribution").Value.String()
 
-	published, err := debian.NewPublishedRepo(prefix, distribution, component, context.ArchitecturesList(), source, context.CollectionFactory())
+	published, err := deb.NewPublishedRepo(prefix, distribution, component, context.ArchitecturesList(), source, context.CollectionFactory())
 	if err != nil {
 		return fmt.Errorf("unable to publish: %s", err)
 	}
diff --git a/cmd/repo_add.go b/cmd/repo_add.go
index 41309565..278ebf6d 100644
--- a/cmd/repo_add.go
+++ b/cmd/repo_add.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
@@ -35,7 +35,7 @@ func aptlyRepoAdd(cmd *commander.Command, args []string) error {
 
 	context.Progress().Printf("Loading packages...\n")
 
-	list, err := debian.NewPackageListFromRefList(repo.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	list, err := deb.NewPackageListFromRefList(repo.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
 	if err != nil {
 		return fmt.Errorf("unable to load packages: %s", err)
 	}
@@ -78,25 +78,25 @@ func aptlyRepoAdd(cmd *commander.Command, args []string) error {
 
 	for _, file := range packageFiles {
 		var (
-			stanza debian.Stanza
-			p      *debian.Package
+			stanza deb.Stanza
+			p      *deb.Package
 		)
 
 		candidateProcessedFiles := []string{}
 		isSourcePackage := strings.HasSuffix(file, ".dsc")
 
 		if isSourcePackage {
-			stanza, err = debian.GetControlFileFromDsc(file, verifier)
+			stanza, err = deb.GetControlFileFromDsc(file, verifier)
 
 			if err == nil {
 				stanza["Package"] = stanza["Source"]
 				delete(stanza, "Source")
 
-				p, err = debian.NewSourcePackageFromControlFile(stanza)
+				p, err = deb.NewSourcePackageFromControlFile(stanza)
 			}
 		} else {
-			stanza, err = debian.GetControlFileFromDeb(file)
-			p = debian.NewPackageFromControlFile(stanza)
+			stanza, err = deb.GetControlFileFromDeb(file)
+			p = deb.NewPackageFromControlFile(stanza)
 		}
 		if err != nil {
 			context.Progress().ColoredPrintf("@y[!]@| @!Unable to read file %s: %s@|", file, err)
@@ -110,9 +110,9 @@ func aptlyRepoAdd(cmd *commander.Command, args []string) error {
 		}
 
 		if isSourcePackage {
-			p.UpdateFiles(append(p.Files(), debian.PackageFile{Filename: filepath.Base(file), Checksums: checksums}))
+			p.UpdateFiles(append(p.Files(), deb.PackageFile{Filename: filepath.Base(file), Checksums: checksums}))
 		} else {
-			p.UpdateFiles([]debian.PackageFile{debian.PackageFile{Filename: filepath.Base(file), Checksums: checksums}})
+			p.UpdateFiles([]deb.PackageFile{deb.PackageFile{Filename: filepath.Base(file), Checksums: checksums}})
 		}
 
 		err = context.PackagePool().Import(file, checksums.MD5)
@@ -158,7 +158,7 @@ func aptlyRepoAdd(cmd *commander.Command, args []string) error {
 		processedFiles = append(processedFiles, candidateProcessedFiles...)
 	}
 
-	repo.UpdateRefList(debian.NewPackageRefListFromPackageList(list))
+	repo.UpdateRefList(deb.NewPackageRefListFromPackageList(list))
 
 	err = context.CollectionFactory().LocalRepoCollection().Update(repo)
 	if err != nil {
diff --git a/cmd/repo_create.go b/cmd/repo_create.go
index 75864dfb..3e622d14 100644
--- a/cmd/repo_create.go
+++ b/cmd/repo_create.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )
@@ -14,7 +14,7 @@ func aptlyRepoCreate(cmd *commander.Command, args []string) error {
 		return err
 	}
 
-	repo := debian.NewLocalRepo(args[0], context.flags.Lookup("comment").Value.String())
+	repo := deb.NewLocalRepo(args[0], context.flags.Lookup("comment").Value.String())
 	repo.DefaultDistribution = context.flags.Lookup("distribution").Value.String()
 	repo.DefaultComponent = context.flags.Lookup("component").Value.String()
 
diff --git a/cmd/repo_list.go b/cmd/repo_list.go
index 0c0f048f..c1577b35 100644
--- a/cmd/repo_list.go
+++ b/cmd/repo_list.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"sort"
 )
@@ -18,7 +18,7 @@ func aptlyRepoList(cmd *commander.Command, args []string) error {
 		fmt.Printf("List of mirrors:\n")
 		repos := make([]string, context.CollectionFactory().LocalRepoCollection().Len())
 		i := 0
-		context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *debian.LocalRepo) error {
+		context.CollectionFactory().LocalRepoCollection().ForEach(func(repo *deb.LocalRepo) error {
 			err := context.CollectionFactory().LocalRepoCollection().LoadComplete(repo)
 			if err != nil {
 				return err
diff --git a/cmd/repo_move.go b/cmd/repo_move.go
index b3633da0..9e35312f 100644
--- a/cmd/repo_move.go
+++ b/cmd/repo_move.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 	"sort"
@@ -28,8 +28,8 @@ func aptlyRepoMoveCopyImport(cmd *commander.Command, args []string) error {
 	}
 
 	var (
-		srcRefList *debian.PackageRefList
-		srcRepo    *debian.LocalRepo
+		srcRefList *deb.PackageRefList
+		srcRepo    *deb.LocalRepo
 	)
 
 	if command == "copy" || command == "move" {
@@ -49,7 +49,7 @@ func aptlyRepoMoveCopyImport(cmd *commander.Command, args []string) error {
 
 		srcRefList = srcRepo.RefList()
 	} else if command == "import" {
-		var srcRemoteRepo *debian.RemoteRepo
+		var srcRemoteRepo *deb.RemoteRepo
 
 		srcRemoteRepo, err = context.CollectionFactory().RemoteRepoCollection().ByName(args[0])
 		if err != nil {
@@ -72,12 +72,12 @@ func aptlyRepoMoveCopyImport(cmd *commander.Command, args []string) error {
 
 	context.Progress().Printf("Loading packages...\n")
 
-	dstList, err := debian.NewPackageListFromRefList(dstRepo.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	dstList, err := deb.NewPackageListFromRefList(dstRepo.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
 	if err != nil {
 		return fmt.Errorf("unable to load packages: %s", err)
 	}
 
-	srcList, err := debian.NewPackageListFromRefList(srcRefList, context.CollectionFactory().PackageCollection(), context.Progress())
+	srcList, err := deb.NewPackageListFromRefList(srcRefList, context.CollectionFactory().PackageCollection(), context.Progress())
 	if err != nil {
 		return fmt.Errorf("unable to load packages: %s", err)
 	}
@@ -120,7 +120,7 @@ func aptlyRepoMoveCopyImport(cmd *commander.Command, args []string) error {
 		verb = "imported"
 	}
 
-	err = toProcess.ForEach(func(p *debian.Package) error {
+	err = toProcess.ForEach(func(p *deb.Package) error {
 		err = dstList.Add(p)
 		if err != nil {
 			return err
@@ -139,7 +139,7 @@ func aptlyRepoMoveCopyImport(cmd *commander.Command, args []string) error {
 	if context.flags.Lookup("dry-run").Value.Get().(bool) {
 		context.Progress().Printf("\nChanges not saved, as dry run has been requested.\n")
 	} else {
-		dstRepo.UpdateRefList(debian.NewPackageRefListFromPackageList(dstList))
+		dstRepo.UpdateRefList(deb.NewPackageRefListFromPackageList(dstList))
 
 		err = context.CollectionFactory().LocalRepoCollection().Update(dstRepo)
 		if err != nil {
@@ -147,7 +147,7 @@ func aptlyRepoMoveCopyImport(cmd *commander.Command, args []string) error {
 		}
 
 		if command == "move" {
-			srcRepo.UpdateRefList(debian.NewPackageRefListFromPackageList(srcList))
+			srcRepo.UpdateRefList(deb.NewPackageRefListFromPackageList(srcList))
 
 			err = context.CollectionFactory().LocalRepoCollection().Update(srcRepo)
 			if err != nil {
diff --git a/cmd/repo_remove.go b/cmd/repo_remove.go
index 13d89205..ae356ac4 100644
--- a/cmd/repo_remove.go
+++ b/cmd/repo_remove.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )
@@ -28,7 +28,7 @@ func aptlyRepoRemove(cmd *commander.Command, args []string) error {
 
 	context.Progress().Printf("Loading packages...\n")
 
-	list, err := debian.NewPackageListFromRefList(repo.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	list, err := deb.NewPackageListFromRefList(repo.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
 	if err != nil {
 		return fmt.Errorf("unable to load packages: %s", err)
 	}
@@ -39,7 +39,7 @@ func aptlyRepoRemove(cmd *commander.Command, args []string) error {
 		return fmt.Errorf("unable to remove: %s", err)
 	}
 
-	toRemove.ForEach(func(p *debian.Package) error {
+	toRemove.ForEach(func(p *deb.Package) error {
 		list.Remove(p)
 		context.Progress().ColoredPrintf("@r[-]@| %s removed", p)
 		return nil
@@ -48,7 +48,7 @@ func aptlyRepoRemove(cmd *commander.Command, args []string) error {
 	if context.flags.Lookup("dry-run").Value.Get().(bool) {
 		context.Progress().Printf("\nChanges not saved, as dry run has been requested.\n")
 	} else {
-		repo.UpdateRefList(debian.NewPackageRefListFromPackageList(list))
+		repo.UpdateRefList(deb.NewPackageRefListFromPackageList(list))
 
 		err = context.CollectionFactory().LocalRepoCollection().Update(repo)
 		if err != nil {
diff --git a/cmd/serve.go b/cmd/serve.go
index d2ff68b1..0131d884 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
@@ -38,9 +38,9 @@ func aptlyServe(cmd *commander.Command, args []string) error {
 	fmt.Printf("Serving published repositories, recommended apt sources list:\n\n")
 
 	sources := make(sort.StringSlice, 0, context.CollectionFactory().PublishedRepoCollection().Len())
-	published := make(map[string]*debian.PublishedRepo, context.CollectionFactory().PublishedRepoCollection().Len())
+	published := make(map[string]*deb.PublishedRepo, context.CollectionFactory().PublishedRepoCollection().Len())
 
-	err = context.CollectionFactory().PublishedRepoCollection().ForEach(func(repo *debian.PublishedRepo) error {
+	err = context.CollectionFactory().PublishedRepoCollection().ForEach(func(repo *deb.PublishedRepo) error {
 		err := context.CollectionFactory().PublishedRepoCollection().LoadComplete(repo, context.CollectionFactory())
 		if err != nil {
 			return err
diff --git a/cmd/snapshot_create.go b/cmd/snapshot_create.go
index 73c567aa..a4e3af38 100644
--- a/cmd/snapshot_create.go
+++ b/cmd/snapshot_create.go
@@ -2,19 +2,19 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 )
 
 func aptlySnapshotCreate(cmd *commander.Command, args []string) error {
 	var (
 		err      error
-		snapshot *debian.Snapshot
+		snapshot *deb.Snapshot
 	)
 
 	if len(args) == 4 && args[1] == "from" && args[2] == "mirror" {
 		// aptly snapshot create snap from mirror mirror
-		var repo *debian.RemoteRepo
+		var repo *deb.RemoteRepo
 
 		repoName, snapshotName := args[3], args[0]
 
@@ -28,13 +28,13 @@ func aptlySnapshotCreate(cmd *commander.Command, args []string) error {
 			return fmt.Errorf("unable to create snapshot: %s", err)
 		}
 
-		snapshot, err = debian.NewSnapshotFromRepository(snapshotName, repo)
+		snapshot, err = deb.NewSnapshotFromRepository(snapshotName, repo)
 		if err != nil {
 			return fmt.Errorf("unable to create snapshot: %s", err)
 		}
 	} else if len(args) == 4 && args[1] == "from" && args[2] == "repo" {
 		// aptly snapshot create snap from repo repo
-		var repo *debian.LocalRepo
+		var repo *deb.LocalRepo
 
 		localRepoName, snapshotName := args[3], args[0]
 
@@ -48,7 +48,7 @@ func aptlySnapshotCreate(cmd *commander.Command, args []string) error {
 			return fmt.Errorf("unable to create snapshot: %s", err)
 		}
 
-		snapshot, err = debian.NewSnapshotFromLocalRepo(snapshotName, repo)
+		snapshot, err = deb.NewSnapshotFromLocalRepo(snapshotName, repo)
 		if err != nil {
 			return fmt.Errorf("unable to create snapshot: %s", err)
 		}
@@ -56,9 +56,9 @@ func aptlySnapshotCreate(cmd *commander.Command, args []string) error {
 		// aptly snapshot create snap empty
 		snapshotName := args[0]
 
-		packageList := debian.NewPackageList()
+		packageList := deb.NewPackageList()
 
-		snapshot = debian.NewSnapshotFromPackageList(snapshotName, nil, packageList, "Created as empty")
+		snapshot = deb.NewSnapshotFromPackageList(snapshotName, nil, packageList, "Created as empty")
 	} else {
 		cmd.Usage()
 		return err
diff --git a/cmd/snapshot_list.go b/cmd/snapshot_list.go
index 35bf7c26..37ee6ab1 100644
--- a/cmd/snapshot_list.go
+++ b/cmd/snapshot_list.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"sort"
 )
@@ -20,7 +20,7 @@ func aptlySnapshotList(cmd *commander.Command, args []string) error {
 		snapshots := make([]string, context.CollectionFactory().SnapshotCollection().Len())
 
 		i := 0
-		context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *debian.Snapshot) error {
+		context.CollectionFactory().SnapshotCollection().ForEach(func(snapshot *deb.Snapshot) error {
 			snapshots[i] = snapshot.String()
 			i++
 			return nil
diff --git a/cmd/snapshot_merge.go b/cmd/snapshot_merge.go
index 1069589d..7a210095 100644
--- a/cmd/snapshot_merge.go
+++ b/cmd/snapshot_merge.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"strings"
 )
@@ -14,7 +14,7 @@ func aptlySnapshotMerge(cmd *commander.Command, args []string) error {
 		return err
 	}
 
-	sources := make([]*debian.Snapshot, len(args)-1)
+	sources := make([]*deb.Snapshot, len(args)-1)
 
 	for i := 0; i < len(args)-1; i++ {
 		sources[i], err = context.CollectionFactory().SnapshotCollection().ByName(args[i+1])
@@ -40,7 +40,7 @@ func aptlySnapshotMerge(cmd *commander.Command, args []string) error {
 	}
 
 	// Create <destination> snapshot
-	destination := debian.NewSnapshotFromRefList(args[0], sources, result,
+	destination := deb.NewSnapshotFromRefList(args[0], sources, result,
 		fmt.Sprintf("Merged from sources: %s", strings.Join(sourceDescription, ", ")))
 
 	err = context.CollectionFactory().SnapshotCollection().Add(destination)
diff --git a/cmd/snapshot_pull.go b/cmd/snapshot_pull.go
index 31190860..30f99d97 100644
--- a/cmd/snapshot_pull.go
+++ b/cmd/snapshot_pull.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 	"sort"
@@ -46,12 +46,12 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
 
 	// Convert snapshot to package list
 	context.Progress().Printf("Loading packages (%d)...\n", snapshot.RefList().Len()+source.RefList().Len())
-	packageList, err := debian.NewPackageListFromRefList(snapshot.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	packageList, err := deb.NewPackageListFromRefList(snapshot.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
 	if err != nil {
 		return fmt.Errorf("unable to load packages: %s", err)
 	}
 
-	sourcePackageList, err := debian.NewPackageListFromRefList(source.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	sourcePackageList, err := deb.NewPackageListFromRefList(source.RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
 	if err != nil {
 		return fmt.Errorf("unable to load packages: %s", err)
 	}
@@ -76,9 +76,9 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
 	}
 
 	// Initial dependencies out of arguments
-	initialDependencies := make([]debian.Dependency, len(args)-3)
+	initialDependencies := make([]deb.Dependency, len(args)-3)
 	for i, arg := range args[3:] {
-		initialDependencies[i], err = debian.ParseDependency(arg)
+		initialDependencies[i], err = deb.ParseDependency(arg)
 		if err != nil {
 			return fmt.Errorf("unable to parse argument: %s", err)
 		}
@@ -86,7 +86,7 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
 
 	// Perform pull
 	for _, arch := range architecturesList {
-		dependencies := make([]debian.Dependency, len(initialDependencies), 128)
+		dependencies := make([]deb.Dependency, len(initialDependencies), 128)
 		for i := range dependencies {
 			dependencies[i] = initialDependencies[i]
 			dependencies[i].Architecture = arch
@@ -105,10 +105,10 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
 
 			if !noRemove {
 				// Remove all packages with the same name and architecture
-				for p := packageList.Search(debian.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name}); p != nil; {
+				for p := packageList.Search(deb.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name}); p != nil; {
 					packageList.Remove(p)
 					context.Progress().ColoredPrintf("@r[-]@| %s removed", p)
-					p = packageList.Search(debian.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name})
+					p = packageList.Search(deb.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name})
 				}
 			}
 
@@ -121,10 +121,10 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
 			}
 
 			// Find missing dependencies for single added package
-			pL := debian.NewPackageList()
+			pL := deb.NewPackageList()
 			pL.Add(pkg)
 
-			var missing []debian.Dependency
+			var missing []deb.Dependency
 			missing, err = pL.VerifyDependencies(context.DependencyOptions(), []string{arch}, packageList, nil)
 			if err != nil {
 				context.Progress().ColoredPrintf("@y[!]@| @!Error while verifying dependencies for pkg %s: %s@|", pkg, err)
@@ -151,7 +151,7 @@ func aptlySnapshotPull(cmd *commander.Command, args []string) error {
 		context.Progress().Printf("\nNot creating snapshot, as dry run was requested.\n")
 	} else {
 		// Create <destination> snapshot
-		destination := debian.NewSnapshotFromPackageList(args[2], []*debian.Snapshot{snapshot, source}, packageList,
+		destination := deb.NewSnapshotFromPackageList(args[2], []*deb.Snapshot{snapshot, source}, packageList,
 			fmt.Sprintf("Pulled into '%s' with '%s' as source, pull request was: '%s'", snapshot.Name, source.Name, strings.Join(args[3:], " ")))
 
 		err = context.CollectionFactory().SnapshotCollection().Add(destination)
diff --git a/cmd/snapshot_verify.go b/cmd/snapshot_verify.go
index 4159a43d..6b152b6b 100644
--- a/cmd/snapshot_verify.go
+++ b/cmd/snapshot_verify.go
@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/smira/aptly/debian"
+	"github.com/smira/aptly/deb"
 	"github.com/smira/commander"
 	"sort"
 )
@@ -14,7 +14,7 @@ func aptlySnapshotVerify(cmd *commander.Command, args []string) error {
 		return err
 	}
 
-	snapshots := make([]*debian.Snapshot, len(args))
+	snapshots := make([]*deb.Snapshot, len(args))
 	for i := range snapshots {
 		snapshots[i], err = context.CollectionFactory().SnapshotCollection().ByName(args[i])
 		if err != nil {
@@ -29,20 +29,20 @@ func aptlySnapshotVerify(cmd *commander.Command, args []string) error {
 
 	context.Progress().Printf("Loading packages...\n")
 
-	packageList, err := debian.NewPackageListFromRefList(snapshots[0].RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+	packageList, err := deb.NewPackageListFromRefList(snapshots[0].RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
 	if err != nil {
 		fmt.Errorf("unable to load packages: %s", err)
 	}
 
-	sourcePackageList := debian.NewPackageList()
+	sourcePackageList := deb.NewPackageList()
 	err = sourcePackageList.Append(packageList)
 	if err != nil {
 		fmt.Errorf("unable to merge sources: %s", err)
 	}
 
-	var pL *debian.PackageList
+	var pL *deb.PackageList
 	for i := 1; i < len(snapshots); i++ {
-		pL, err = debian.NewPackageListFromRefList(snapshots[i].RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
+		pL, err = deb.NewPackageListFromRefList(snapshots[i].RefList(), context.CollectionFactory().PackageCollection(), context.Progress())
 		if err != nil {
 			fmt.Errorf("unable to load packages: %s", err)
 		}
diff --git a/deb/collections.go b/deb/collections.go
index ca161f2a..dd5fd9d5 100644
--- a/deb/collections.go
+++ b/deb/collections.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"github.com/smira/aptly/database"
diff --git a/deb/deb.go b/deb/deb.go
index 99585fc6..6d749f3c 100644
--- a/deb/deb.go
+++ b/deb/deb.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"archive/tar"
diff --git a/deb/deb_test.go b/deb/deb_test.go
index 9ce1df59..d2f720e0 100644
--- a/deb/deb_test.go
+++ b/deb/deb_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"github.com/smira/aptly/utils"
diff --git a/deb/debian.go b/deb/debian.go
index 1982c9af..d0482eb0 100644
--- a/deb/debian.go
+++ b/deb/debian.go
@@ -1,2 +1,2 @@
 // Package debian implements Debian-specific repository handling
-package debian
+package deb
diff --git a/deb/debian_test.go b/deb/debian_test.go
index 3b10182d..8406e198 100644
--- a/deb/debian_test.go
+++ b/deb/debian_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	. "launchpad.net/gocheck"
diff --git a/deb/format.go b/deb/format.go
index c78e066e..a909d332 100644
--- a/deb/format.go
+++ b/deb/format.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bufio"
diff --git a/deb/format_test.go b/deb/format_test.go
index 80d8af48..b7e843c3 100644
--- a/deb/format_test.go
+++ b/deb/format_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bufio"
diff --git a/deb/list.go b/deb/list.go
index b26df418..63db6e3e 100644
--- a/deb/list.go
+++ b/deb/list.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"fmt"
diff --git a/deb/list_test.go b/deb/list_test.go
index c57d8d6d..3877605a 100644
--- a/deb/list_test.go
+++ b/deb/list_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"errors"
diff --git a/deb/local.go b/deb/local.go
index a4e1a003..4002b546 100644
--- a/deb/local.go
+++ b/deb/local.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bytes"
diff --git a/deb/local_test.go b/deb/local_test.go
index dd441584..0830c1ef 100644
--- a/deb/local_test.go
+++ b/deb/local_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"errors"
diff --git a/deb/package.go b/deb/package.go
index 7d668e3d..6028f4d0 100644
--- a/deb/package.go
+++ b/deb/package.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"fmt"
diff --git a/deb/package_collection.go b/deb/package_collection.go
index 4454fde6..5e5a8939 100644
--- a/deb/package_collection.go
+++ b/deb/package_collection.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bytes"
diff --git a/deb/package_collection_test.go b/deb/package_collection_test.go
index d502c35d..a444fec1 100644
--- a/deb/package_collection_test.go
+++ b/deb/package_collection_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"github.com/smira/aptly/database"
diff --git a/deb/package_deps.go b/deb/package_deps.go
index 0de14925..097709db 100644
--- a/deb/package_deps.go
+++ b/deb/package_deps.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"strings"
diff --git a/deb/package_files.go b/deb/package_files.go
index 236b5bfe..31a37cbe 100644
--- a/deb/package_files.go
+++ b/deb/package_files.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"encoding/binary"
diff --git a/deb/package_files_test.go b/deb/package_files_test.go
index cba5444e..6b2adb39 100644
--- a/deb/package_files_test.go
+++ b/deb/package_files_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"github.com/smira/aptly/files"
diff --git a/deb/package_test.go b/deb/package_test.go
index 9888cb14..0105d4b7 100644
--- a/deb/package_test.go
+++ b/deb/package_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bytes"
diff --git a/deb/ppa.go b/deb/ppa.go
index bd8a0099..3d45858b 100644
--- a/deb/ppa.go
+++ b/deb/ppa.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"fmt"
diff --git a/deb/ppa_test.go b/deb/ppa_test.go
index 09ff0cac..99467ce7 100644
--- a/deb/ppa_test.go
+++ b/deb/ppa_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"github.com/smira/aptly/utils"
diff --git a/deb/publish.go b/deb/publish.go
index 5ca891fc..cbc8aa51 100644
--- a/deb/publish.go
+++ b/deb/publish.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bufio"
diff --git a/deb/publish_test.go b/deb/publish_test.go
index 62c8f6d4..33e23c75 100644
--- a/deb/publish_test.go
+++ b/deb/publish_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"errors"
diff --git a/deb/reflist.go b/deb/reflist.go
index 3eeb7a46..fe37813d 100644
--- a/deb/reflist.go
+++ b/deb/reflist.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bytes"
diff --git a/deb/reflist_test.go b/deb/reflist_test.go
index e131b775..e376eb9e 100644
--- a/deb/reflist_test.go
+++ b/deb/reflist_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"errors"
diff --git a/deb/remote.go b/deb/remote.go
index 4d675f63..f2c7ba69 100644
--- a/deb/remote.go
+++ b/deb/remote.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bytes"
diff --git a/deb/remote_test.go b/deb/remote_test.go
index 35391009..3cd7d87c 100644
--- a/deb/remote_test.go
+++ b/deb/remote_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"errors"
diff --git a/deb/snapshot.go b/deb/snapshot.go
index b1f3b24d..52bfa7f1 100644
--- a/deb/snapshot.go
+++ b/deb/snapshot.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"bytes"
diff --git a/deb/snapshot_test.go b/deb/snapshot_test.go
index 160aca03..9d52d713 100644
--- a/deb/snapshot_test.go
+++ b/deb/snapshot_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"errors"
diff --git a/deb/version.go b/deb/version.go
index c6997e76..e7b11584 100644
--- a/deb/version.go
+++ b/deb/version.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	"fmt"
diff --git a/deb/version_test.go b/deb/version_test.go
index 844dc4ba..53a47b95 100644
--- a/deb/version_test.go
+++ b/deb/version_test.go
@@ -1,4 +1,4 @@
-package debian
+package deb
 
 import (
 	. "launchpad.net/gocheck"