New folder organization and file redirection