Switch to PSR4
Update Travis file
Code cleanup