diff --git a/.gitignore b/.gitignore
index 528610a..4532471 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+**/uuids
+
 .vscode/.browse.*
 nimsuggest.log
 
diff --git a/README.md b/README.md
index fd64a5a..2709427 100644
--- a/README.md
+++ b/README.md
@@ -7,28 +7,19 @@ API:
 type UUID* = object
   ## 128-bit UUID compliant with RFC-4122
 
-proc initUUID*(mostSigBits, leastSigBits: int64): UUID =
-  ## Initializes UUID with the specified most and least significant bits
-
-proc leastSigBits*(uuid: UUID): int64 {.inline.}
-  ## Returns 64 least significant bits of the ``uuid``
-
-proc mostSigBits*(uuid: UUID): int64 {.inline.}
-  ## Returns 64 most significant bits of the ``uuid``
-
 proc `$`*(uuid: UUID): string
-  ## Returns a string representation of the ``uuid`` in canonical form.
+  ## Returns a string representation of the UUID in canonical form.
 
 proc hash*(uuid: UUID): Hash
-  ## Computes hash of the specified ``uuid``.
+  ## Computes hash of the specified UUID.
 
 proc `==`*(x, y: UUID): bool
   ## Returns true when the specified UUIDs are equal, false otherwise.
 
 proc isZero*(uuid: UUID): bool
-  ## Returns ``true`` when the ``uuid`` is zero (not set), ``false`` otherwise.
+  ## Returns ``true`` when the UUID is zero (not set), ``false`` otherwise.
 
-proc genUUID*(): UUID
+proc genUUID*(): UUID =
   ## Returns a random (v4) UUID.
   ## Uses a thread-local cryptographically secure PRNG (ISAAC) seeded with
   ## true random values obtained from OS.
diff --git a/uuids/urandom.nim b/src/urandom.nim
similarity index 93%
rename from uuids/urandom.nim
rename to src/urandom.nim
index 6078de4..3666214 100644
--- a/uuids/urandom.nim
+++ b/src/urandom.nim
@@ -16,16 +16,16 @@ when defined(windows):
     proc CryptAcquireContext(
       phProv: ptr HCRYPTPROV, pszContainer: WideCString,
       pszProvider: WideCString, dwProvType: DWORD, dwFlags: DWORD
-    ): WINBOOL {.importc: "CryptAcquireContextW".}
+    ): WinBool {.importc: "CryptAcquireContextW".}
   else:
     proc CryptAcquireContext(
       phProv: ptr HCRYPTPROV, pszContainer: cstring, pszProvider: cstring,
       dwProvType: DWORD, dwFlags: DWORD
-    ): WINBOOL {.importc: "CryptAcquireContextA".}
+    ): WinBool {.importc: "CryptAcquireContextA".}
 
   proc CryptGenRandom(
     hProv: HCRYPTPROV, dwLen: DWORD, pbBuffer: pointer
-  ): WINBOOL {.importc: "CryptGenRandom".}
+  ): WinBool {.importc: "CryptGenRandom".}
 
   {.pop.}
 
diff --git a/uuids.nim b/src/uuids.nim
similarity index 50%
rename from uuids.nim
rename to src/uuids.nim
index b44ede2..6175e44 100644
--- a/uuids.nim
+++ b/src/uuids.nim
@@ -1,6 +1,6 @@
 import strutils, hashes
 import isaac
-import uuids/urandom
+import urandom
 
 type
   UUID* = object
@@ -10,45 +10,16 @@ type
 
 template toHex(s: string, start: Natural,
                x: BiggestInt, len: Positive) =
-  const HexChars = ['0', '1', '2', '3', '4', '5', '6', '7', '8',
-                    '9', 'a', 'b', 'c', 'd', 'e', 'f']
+  const HexChars = "0123456789abcdef"
   var n = x
   for j in countdown(len - 1, 0):
-    s[start + j] = HexChars[int(n and 0xF)]
+    s[start + j] = HexChars[n and 0xF]
     n = n shr 4
     # handle negative overflow
     if n == 0 and x < 0: n = -1
 
-proc uuidsParseHexInt(s: string, maxLen: int): int64 =
-  if s.len == 0:
-    raise newException(ValueError, "UUID part is empty")
-  if s.len > maxLen or s.len > sizeof(result) * 2:
-    raise newException(ValueError, "UUID part is longer than expected")
-  for c in s:
-    case c
-    of '0'..'9':
-      result = result shl 4 or (ord(c) - ord('0'))
-    of 'a'..'f':
-      result = result shl 4 or (ord(c) - ord('a') + 10)
-    of 'A'..'F':
-      result = result shl 4 or (ord(c) - ord('A') + 10)
-    else: raise newException(ValueError, "Invalid hex string: " & s)
-
-proc initUUID*(mostSigBits, leastSigBits: int64): UUID =
-  ## Initializes UUID with the specified most and least significant bits
-  result.mostSigBits = mostSigBits
-  result.leastSigBits = leastSigBits
-
-proc leastSigBits*(uuid: UUID): int64 {.inline.} =
-  ## Returns 64 least significant bits of the ``uuid``
-  uuid.leastSigBits
-
-proc mostSigBits*(uuid: UUID): int64 {.inline.} =
-  ## Returns 64 most significant bits of the ``uuid``
-  uuid.mostSigBits
-
 proc `$`*(uuid: UUID): string =
-  ## Returns a string representation of the ``uuid`` in canonical form.
+  ## Returns a string representation of the UUID in canonical form.
   result = newString(36)
   toHex(result, 0, uuid.mostSigBits shr 32, 8)
   result[8] = '-'
@@ -61,7 +32,7 @@ proc `$`*(uuid: UUID): string =
   toHex(result, 24, uuid.leastSigBits, 12)
 
 proc hash*(uuid: UUID): Hash =
-  ## Computes hash of the specified ``uuid``.
+  ## Computes hash of the specified UUID.
   result = uuid.mostSigBits.hash() !& uuid.leastSigBits.hash()
   result = !$result
 
@@ -70,7 +41,7 @@ proc `==`*(x, y: UUID): bool =
   x.mostSigBits == y.mostSigBits and x.leastSigBits == y.leastSigBits
 
 proc isZero*(uuid: UUID): bool =
-  ## Returns ``true`` when the ``uuid`` is zero (not set), ``false`` otherwise.
+  ## Returns ``true`` when the UUID is zero (not set), ``false`` otherwise.
   uuid.mostSigBits == 0'i64 and uuid.leastSigBits == 0'i64
 
 var rand {.threadvar.}: IsaacGenerator
@@ -98,36 +69,25 @@ proc parseUUID*(s: string): UUID {.raises: [ValueError].} =
   if parts.len != 5:
     raise newException(ValueError,
                        "UUID must consist of 5 parts separated with `-`")
-  var mostSigBits: int64 = uuidsParseHexInt(parts[0], 8)
+  var mostSigBits: int64 = parseHexInt(parts[0])
   mostSigBits = mostSigBits shl 16
-  mostSigBits = mostSigBits or uuidsParseHexInt(parts[1], 4)
+  mostSigBits = mostSigBits or parseHexInt(parts[1])
   mostSigBits = mostSigBits shl 16
-  mostSigBits = mostSigBits or uuidsParseHexInt(parts[2], 4)
+  mostSigBits = mostSigBits or parseHexInt(parts[2])
 
-  var leastSigBits: int64 = uuidsParseHexInt(parts[3], 4)
+  var leastSigBits: int64 = parseHexInt(parts[3])
   leastSigBits = leastSigBits shl 48
-  leastSigBits = leastSigBits or uuidsParseHexInt(parts[4], 12)
+  leastSigBits = leastSigBits or parseHexInt(parts[4])
 
   result = UUID(mostSigBits: mostSigBits, leastSigBits: leastSigBits)
 
 when isMainModule:
   var uuid: UUID
   assert(uuid.isZero())
-  for i in 1..100:
-    uuid = genUUID()
-    let uuidStr = $uuid
-    assert(uuidStr.len == 36)
-    assert(uuidStr[14] == '4') # version
-    assert(uuidStr[19] in {'8', '9', 'a', 'b'}) # variant (2 bits)
-
-    let parsedUUID = uuidStr.parseUUID()
-    assert(parsedUUID == uuid)
-    assert(parsedUUID.hash() == uuid.hash())
-    assert(mostSigBits(parsedUUID) == mostSigBits(uuid))
-    assert(leastSigBits(parsedUUID) == leastSigBits(uuid))
-
-    let newUUID = initUUID(mostSigBits(uuid), leastSigBits(uuid))
-    assert(newUUID == uuid)
-    assert(newUUID.hash() == uuid.hash())
-    assert(mostSigBits(newUUID) == mostSigBits(uuid))
-    assert(leastSigBits(newUUID) == leastSigBits(uuid))
+  uuid = genUUID()
+  let uuidStr = $uuid
+  assert(uuidStr.len == 36)
+  assert(uuidStr[14] == '4') # version
+  assert(uuidStr[19] in {'8', '9', 'a', 'b'}) # variant (2 bits)
+  assert(uuidStr.parseUUID() == uuid)
+  assert(uuidStr.parseUUID().hash() == uuid.hash())
diff --git a/uuids.nimble b/uuids.nimble
index ccc6e86..1e2d425 100644
--- a/uuids.nimble
+++ b/uuids.nimble
@@ -1,9 +1,10 @@
 [Package]
 name: "uuids"
-version: "0.1.11"
+version: "0.1.4"
 author: "Xored Software, Inc."
 description: "UUID library"
 license: "MIT"
+srcDir: "src"
 
 [Deps]
-requires: "isaac >= 0.1.3"
+requires: "isaac >= 0.1.0"