reorganize project, update make rules