Some refactoring of file based artifact storage to keep re-useable parts apart