Index action improvement
Moved interfaces to subdirs