Modified package to PSR-4 compliant and added some todos