Updated template and added dirs