Refactor to composer and PSR standards