Template re-arrangement
Remove empty file