Remove unused storage configuration bits
Re-add storage configuration and restructure all the things