Tidied up the folder layout and trying to do a tag again