Remove two caps and now creating usefull folders