Changes for files structure and add join page