Some refactor

- Packages added
- All methods are static now
- Code formated