make coreStorage and move FS out of core