reorg folder structure/re-implement modal accessibility changes