New folder structure, user cp
Merge remote-tracking branch 'origin/master'