tidy up content and folder layout