Converted project to PSR-4 and updated a few docblocks