Create directive, tidy up and remove jeykll