Modified to have a better directory structure.