Add Storage related classes to CMakeLists, fix includes