change project structure

change project structure for new cq style project