Added transitions and removed old files