changed file structure
Merge remote-tracking branch 'origin/doug'