refactored class about singleton to enum *best option
refactored package name
e.g don't create unnecessary methods