Separated ui and storage modules