Merge "Create dex subdirectory"