add all remaining files
remove dio...