Cleaned API removing some static methods for filenames.
Adapted implementations and tests.