BM - Made data storage location use standard paths