cleaned up project structure
Merge remote-tracking branch 'origin/josh'