diff --git a/Text/XMLParser/Util.hs b/Text/XMLParser/Util.hs
deleted file mode 100644
--- a/Text/XMLParser/Util.hs
+++ /dev/null
@@ -1,34 +0,0 @@
-module Text.XMLParser.Util (
-
- getTagOfNameChildren
-,getTagsByName
-,getNonEmptyTagOfNameChildren
-,getNonEmptyTagsByName
-,getNonEmptyAttributeByName
-) where 
-
-import Text.XMLParser.XMLParser
-import Data.Maybe
-
-makeNonEmpty [] = Nothing
-makeNonEmpty xs@(_:_) = Just xs
-
-getTagName (Tag _ str _) = Just str
-getTagName _ = Nothing
-
-getTagText (TagString a) = Just a
-getTagText _ = Nothing
-
-getTagChildText (Tag _ _ (Just xs)) = catMaybes $  map getTagText xs
-getTagChildText _ =  []
-
-getTagOfNameChildren str (Tag _ str' (Just xs)) 
-  | str == str' = Just xs
-  | otherwise = Nothing
-
-getTagsByName str xs = filter (maybe False (==str) . getTagName) xs
-
-getNonEmptyTagOfNameChildren str tag = getTagOfNameChildren str tag >>= makeNonEmpty
-getNonEmptyTagsByName name xs = makeNonEmpty $ getTagsByName name xs 
-getNonEmptyAttributeByName attr (Tag attrs _ _) = lookup attr attrs 
-
diff --git a/Text/XMLParser/XMLParser.hs b/Text/XMLParser/XMLParser.hs
deleted file mode 100644
--- a/Text/XMLParser/XMLParser.hs
+++ /dev/null
@@ -1,152 +0,0 @@
-{-# LANGUAGE NoMonomorphismRestriction #-}
-{-# LANGUAGE FlexibleContexts #-} 
-
-module Text.XMLParser.XMLParser (
-  xmlParser
- ,parseXML
- ,showXML
- ,Tag(..)
-) where
-
-import Text.ParserCombinators.Parsec 
-import Control.Monad
-import Data.Monoid
-import Data.Either
-import Data.List
-import Data.Char
-
-keys = map fst
-escapeCodes = 
-  [("gt",'>')
-  ,("lt",'<')
-  ,("amp",'&')
-  ,("quot",'\"')
-  ,("apos",'\'')]
-
-
-data Tag = Tag [(String,String)] String (Maybe [Tag])
-         | TagString String
-         | TagCData String
-  deriving (Show,Eq)
-  
-spaceOut p = between (many space) (many space) p   
-
-attr = do
-  attr <- spaceOut $ many1 (satisfy (liftM2 ((not.).(||)) isSpace (`elem` "=<>")))
-  string "="
-  value <- spaceOut $     between (string "\"") (string "\"") (many1 (noneOf "\""))   
-                     <|>  between (string "'") (string "'") (many1 (noneOf "'"))		
-  return (attr,value)
- 
-
-many1Till p e = do
-       notFollowedBy e
-       x <- p
-       xs <- manyTill p (try e)
-       return (x:xs)
-
-many1Till' p e = do
-                 xs <- many1Till p (lookAhead e)
-                 y <- e
-                 return (xs,y)
-
-openTag = do
- string "<"
- skipMany space
- many1Till' anyChar $ do
-  attrs <- spaceOut $ try (many attr)
-  string ">"
-  return attrs
-
-closeTag str = do
- x <- string "</"
- y <- string str
- z <- (string ">")
- return y
-
-sparse p t = parse p "" t
-sameConstructor (Left _) (Left _) = True
-sameConstructor (Right _) (Right _) = True
-sameConstructor _ _ = False
- 
-tagWithoutContent = do
-  (x,a) <- tagWithoutContent'
-  return (Tag a x Nothing)
-
-  
-tagWithoutContent' = do 
- string "<"
- skipMany space
- many1Till' anyChar $ do
-  attrs <- spaceOut $ try (many (try attr))
-  string "/>"
-  return attrs
-
-groupEithers :: [Either a b] -> [Either [a] [b]]
-groupEithers xs = map (\xs@(x:_) -> either (const (Left (lefts xs))) (const (Right (rights xs))) x) (groupBy sameConstructor xs)
-
-closedTag = do
- (x,a) <- openTag
- let cd = fmap Right cdata'
- let frag = fmap Left fragmentParse
- let text = fmap Right (noneOf "><" >>= return . (:[]) ) 
- y <- manyTill ( try cd <|> try frag <|> text) (try $ closeTag x)
- let s = map (either head ( TagString . replaceEntities . concat )) (groupEithers y)
- return (Tag a x (Just s))
-  
-fragmentParse = do
-  b <- closedTag  
-  return b
-
-xmlParser = do 
-            x <- try tagWithoutContent <|> fragmentParse 
-            eof 
-            return x
-  
-showAttribute (x,y) = x++"="++"\""++y++"\""
-showAttributes atts = concat $ intersperse " " $ map showAttribute atts 
-
-showXML (Tag attr str inner) = case inner of 
-   Nothing -> "<"++str++attr''++"/>"
-   (Just xs) -> "<"++str++attr''++">"++(concatMap showXML xs)++"</"++str++">"
-   where attr'' = if null attr' then attr'
-                                else " "++attr'
-         attr' = showAttributes attr
-showXML (TagString str) = str
-showXML (TagCData str) =str
-
-escapeCode = do
-             char '&'
-             x <- choice (map (\(k,v) -> string k >> return v ) escapeCodes)
-             char ';'
-             return [x]
-
-w = parse escapeCode "" "&lt;"
-
-cdata = do
-   x <- cdata'
-   return (TagCData x)                                                                                                                                                                         
-cdata' = do
- string "<![CDATA["
- many1Till anyChar (string "]]>")
-    
-q = parse cdata "" "<![CDATA[ hi  ]]>"
-
-replaceEntities = (\(Right x) -> x) . parse (replaceParser' escapeCode) ""
-
-replaceParser parser = (\(Right x) ->x) .  parse (replaceParser' parser) "" 
-
-replaceParser' parser = replaceParser'' parser (anyChar >>=(return . (:[])))
-
-replaceParser'' parser p2 = do 
-        	            xs <- many (try parser <|> p2 )
-                            return (concat xs)
-
-
-parseXML = parse xmlParser ""
-
-main = do 
-       let str = "<one green=\"blue\"> &lt; five <two>  <![CDATA[ hello  </two>  ]]>   </two> </one>"
-       print str
-       let rs =  map (parse xmlParser "") [str,"<single/>","<nocont></nocont>"]
-       mapM_ (either (const (print "fail")) (\x -> mapM_ putStrLn [showXML x,show x] )) rs
diff --git a/XMLParser.cabal b/XMLParser.cabal
--- a/XMLParser.cabal
+++ b/XMLParser.cabal
@@ -1,71 +1,31 @@
--- Initial xml-parser.cabal generated by cabal init.  For further 
--- documentation, see http://haskell.org/cabal/users-guide/
-
--- The name of the package.
-name:                XMLParser
-
--- The package version.  See the Haskell package versioning policy (PVP) 
--- for standards guiding when and how versions should be incremented.
--- https://wiki.haskell.org/Package_versioning_policy
--- PVP summary:      +-+------- breaking API changes
---                   | | +----- non-breaking API additions
---                   | | | +--- code changes with no API change
-version:             0.1.0.4
-
--- A short (one-line) description of the package.
-synopsis:            A library to parse xml
-
--- A longer description of the package.
-description:       uses parsec to parse xml
-
--- URL for the project homepage or repository.
-homepage:            xy30.com
-
--- The license under which the package is released.
-license:             GPL-3
-
--- The file containing the license text.
-license-file:        LICENSE
-
--- The package author(s).
-author:              Alan Hawkins
-
--- An email address to which users can send suggestions, bug reports, and 
--- patches.
-maintainer:          hawk.alan@gmail.com
-
--- A copyright notice.
--- copyright:           
-
-category:            XML
-
-build-type:          Simple
+name: XMLParser
+version: 0.1.0.5
+cabal-version: >=1.10
+build-type: Simple
+license: GPL-3
+license-file: LICENSE
+maintainer: hawk.alan@gmail.com
+homepage: xy30.com
+synopsis: A library to parse xml
+description:
+    uses parsec to parse xml
+category: XML
+author: Alan Hawkins
+extra-source-files:
+    ChangeLog.md
+    README.md
 
--- Extra files to be distributed with the package, such as examples or a 
--- README.
-extra-source-files:  ChangeLog.md, README.md
+source-repository head
+    type: git
+    location: http://github.com/xpika/XMLParser.git
 
--- Constraint on the version of Cabal needed to build this package.
-cabal-version:       >=1.10
+library
+    exposed-modules:
+        Text.XMLParser
+    build-depends:
+        base >=4.9 && <4.10,
+        parsec >=3.1 && <3.2
+    default-language: Haskell2010
+    other-extensions: NoMonomorphismRestriction FlexibleContexts
 
 
-library
-  -- Modules exported by the library.
-  exposed-modules:    Text.XMLParser
-  
-  -- Modules included in this library but not exported.
-  other-modules:  Text.XMLParser.XMLParser
-                 ,Text.XMLParser.Util
-  
-  -- LANGUAGE extensions used by modules in this package.
-  other-extensions:    NoMonomorphismRestriction, FlexibleContexts
-  
-  -- Other library packages from which modules are imported.
-  build-depends:       base >=4.9 && <4.10, parsec >=3.1 && <3.2
-  
-  -- Directories containing source files.
-  -- hs-source-dirs:      
-  
-  -- Base language which the package is written in.
-  default-language:    Haskell2010
-