Refactoring to PSR-2, adding in composer.lock file, and removing components dir from git