Change to use PSR-4 autoloading and add the first helper methods (with tests)