Some hierarchical changes

As modal controller & datas on different files.