Added some folder/namespace structuring
Merge remote-tracking branch 'origin/master' into video