move storage to external file for modularisation