Move all the files one level up for PSR-4
More PSR-4 work
Further namespace changes for PSR-4