Moving Storage classes into their own directory.