reorganize and add maven