Correct previous commit, finish VideoMaker, Reorganize code, create AnimationFactory and bases