Move Counter into it's own directory