Add TODO in copyFiles
Change variablesnames to standard
Merge branch 'trunk'