Sorted out template directory structure