Some more tidying up and added folder