Moved common classes to base and worked on slideshow changes