Updated paths and folder names
Updated paths and folder names