Ignore case and dont clear users

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>
Package refactor

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>