Added extra folders to handle new functionality