Moving storage interfaces into their folders