Refactor package structure
Refactor package structure
Move main class to separated package
Fix bugs