Added missing files & removed deprecated files