Folder change and little bit of a tidy up.