Cleanup file structure