better directory structure.