convert to psr4
move tests