Refine structure and add new files