Move the main class to a more suitable package
Add missing @Override, delete useless code