Moved files to src folder
Fixing videostage bug