Add substitute
Reorganize files