Simplified watching and file structure