Reorganized project, now it is consistent with the design document