rearrange folder struct. refine cmake rules