Store files into storage repo. Fix some issues.