Storage refactor
Moving storage files