Make it easier to localize
Remove duplicate classes
Remove debug code
Change file structure