Change to psr4 + fixes to exceptions