Removed unused files
Implemented Path Substitution