reorganize core project