remerge everything
add platform files