Adapted the template to fit in better with the target directory option provided by mr.bob and make use of new mr.bob features