reorganize files for chart
fix sizes
fix types