Move block.tpl.php into new block folder