Fix structure, remove wrongly located files