Reorganize projects and unit tests