fix #1107 get rid of pkg suffix (#1108)

* fix #1107 get rid of pkg suffix

* fix test

src/nimblepkg/init.nim

@@ -79,14 +79,14 @@ proc initSubmodule*(): Submodule =
 # This is just an example to get you started. A typical hybrid package
 # uses this file as the main entry point of the application.
 
-import $1pkg/submodule
+import $1/submodule
 
 when isMainModule:
   echo(getWelcomeMessage())
 """ % info.pkgName
     )
 
-    let pkgSubDir = pkgRoot / info.pkgSrcDir / info.pkgName & "pkg"
+    let pkgSubDir = pkgRoot / info.pkgSrcDir / info.pkgName
     createDirD(pkgSubDir)
     let submodule = pkgSubDir / "submodule".addFileExt("nim")
     writeExampleIfNonExistent(submodule,
@@ -146,7 +146,7 @@ test "can add":
 
 import unittest
 
-import $1pkg/submodule
+import $1/submodule
 test "correct welcome":
   check getWelcomeMessage() == "Hello, World!"
 """ % info.pkgName

src/nimblepkg/packageparser.nim

@@ -96,14 +96,7 @@ proc validatePackageStructure(pkgInfo: PackageInfo, options: Options) =
   ## https://github.com/nim-lang/nimble/issues/144
   let
     realDir = pkgInfo.getRealDir()
-    normalizedBinNames = toSeq(pkgInfo.bin.values).map(
-      (x) => x.changeFileExt("").toLowerAscii()
-    )
-    correctDir =
-      if pkgInfo.basicInfo.name.toLowerAscii() in normalizedBinNames:
-        pkgInfo.basicInfo.name & "pkg"
-      else:
-        pkgInfo.basicInfo.name
+    correctDir = pkgInfo.basicInfo.name
 
   proc onFile(path: string) =
     # Remove the root to leave only the package subdirectories.

tests/tissues.nim

@@ -330,7 +330,7 @@ suite "issues":
           check lines.hasLineStartingWith(
             "Warning: Package 'y' has an incorrect structure. It should" &
             " contain a single directory hierarchy for source files," &
-            " named 'ypkg', but file 'foobar.nim' is in a directory named" &
+            " named 'y', but file 'foobar.nim' is in a directory named" &
             " 'yWrong' instead.")
         of "z":
           check lines.hasLineStartingWith(