cleanup on folder structure