Remove redundant folder
video player fix
Merge branch 'working'