XD-1862: Use subdir for all modules