Citation parsers nearly done
Moving some files around