Fix potential Windows issue
Fix variable name
Consolidate and remove unused files.