Don't echo private key
Organize code according to PSR-4
Fix staging deploy git user name.