Fixed template files appearing along side their parent folder instead of inside it