Refactor package structure
Remove Storage class