Source code classifier refactoring

Please adjust comments accordingly.