Forgot to move files to work with psr-4 autoloading