Initial work, with PSR-4 classes