Cleanup
Moved all regexps to ipkg.regex