Move some stuff and add ic2api to project