updated folder structure, please refer