Cleanup on folder structure