Handle local Filesystem + S3 Started Image Operations

Migrating to PSR-2