Refactoring, started implementing PHPLOC Report