fixed organize with multiple dirs
Merge branch 'master' of titania:/video
testcommit