Reorganize files to incorporate icons in views